ChangeLogTag: Sat Jan 11 14:58:39 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

39 files changed, 18201 insertions, 10929 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d8e6163b85f..d8bd83781c2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,47 @@
+Sat Jan 11 14:58:39 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PortableServer/Default_ORT.pidl:
+        * tao/PortableServer/Default_ORTC.cpp:
+        * tao/PortableServer/Default_ORTC.h:
+        * tao/PortableServer/Default_ORTC.i:
+        * tao/PortableServer/ImR_Locator.pidl:
+        * tao/PortableServer/ImR_LocatorC.cpp:
+        * tao/PortableServer/ImR_LocatorC.h:
+        * tao/PortableServer/ImR_LocatorC.i:
+        * tao/PortableServer/ImR_LocatorS.cpp:
+        * tao/PortableServer/ImR_LocatorS.h:
+        * tao/PortableServer/ImR_LocatorS.i:
+        * tao/PortableServer/ImR_LocatorS_T.cpp:
+        * tao/PortableServer/ImR_LocatorS_T.h:
+        * tao/PortableServer/ImR_LocatorS_T.i:
+        * tao/PortableServer/ImplRepoC.cpp:
+        * tao/PortableServer/ImplRepoC.h:
+        * tao/PortableServer/ImplRepoC.i:
+        * tao/PortableServer/ImplRepoS.cpp:
+        * tao/PortableServer/ImplRepoS.h:
+        * tao/PortableServer/ImplRepoS.i:
+        * tao/PortableServer/ImplRepoS_T.cpp:
+        * tao/PortableServer/ImplRepoS_T.h:
+        * tao/PortableServer/ImplRepoS_T.i:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Object_Adapter.i:
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/POA.h:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/PolicyS.h:
+        * tao/PortableServer/PolicyS.i:
+        * tao/PortableServer/PolicyS_T.cpp:
+        * tao/PortableServer/PolicyS_T.h:
+        * tao/PortableServer/PolicyS_T.i:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/PortableServerC.cpp:
+        * tao/PortableServer/PortableServerC.h:
+        * tao/PortableServer/PortableServerC.i:
+        * tao/PortableServer/TAO_PortableServer.dsp:
+
+	  Regeneration of .pidl files and other changes in the
+	  PortableServer library.
+
 Sat Jan 11 000:18:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any.cpp:
diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl
index 9150a33028f..365933d6c21 100644
--- a/TAO/tao/PortableServer/Default_ORT.pidl
+++ b/TAO/tao/PortableServer/Default_ORT.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Default_ORT.pidl
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index a892a7915bb..958b646bf66 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -19,13 +19,13 @@
 // 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 "Default_ORTC.h"
 
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 #include "tao/ValueFactory.h"
 
 #if defined (__BORLANDC__)
@@ -36,38 +36,39 @@
 #include "Default_ORTC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  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),
+    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
+    24,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-  0, // value modifier
+    0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  0, // member count
-};
+0, // member count
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
     CORBA::tk_value,
@@ -86,9 +87,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
 
 void
 tao_TAO_Default_ORT_ObjectReferenceTemplate_add_ref (
@@ -107,7 +107,7 @@ tao_TAO_Default_ORT_ObjectReferenceTemplate_remove_ref (
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:299
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
 
 // *************************************************************
 // Operations for class TAO_Default_ORT::ObjectReferenceTemplate_var
@@ -160,11 +160,16 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTe
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
-
+  
   return *this;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate*& () // cast
+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_;
 }
@@ -221,7 +226,7 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::tao_remove_ref (
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:569
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
 
 // *************************************************************
 // Operations for class TAO_Default_ORT::ObjectReferenceTemplate_out
@@ -287,7 +292,7 @@ TAO_Default_ORT::ObjectReferenceTemplate_out::operator-> (void)
 // *************************************************************
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:138
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
 
 TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
@@ -296,7 +301,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -306,26 +311,20 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
-void *
-TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
-#endif /* _MSC_VER */
-
 void *
+#if defined (_MSC_VER)
+TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t type_id)
+#else
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
+#endif /* _MSC_VER */
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -334,10 +333,18 @@ 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;
 }
 
+#if defined (_MSC_VER)
+void *
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
+{
+  return this->TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (type_id);
+}
+#endif /* _MSC_VER */
+
 void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -373,29 +380,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);
@@ -403,7 +410,10 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_obv_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
 
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm)
@@ -416,123 +426,62 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_Ob
 {
   return _tao_unmarshal_state (strm);
 }
+
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
 
-// Copying.
+// Copying insertion.
 void
 operator<<= (
-    CORBA::Any &any,
-    TAO_Default_ORT::ObjectReferenceTemplate *value
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << value)
-    {
-      any._tao_replace (
-          TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-// Non-copying.
+// Non-copying insertion.
 void
 operator<<= (
-    CORBA::Any &any,
-    TAO_Default_ORT::ObjectReferenceTemplate **value
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *value)
-    {
-      any._tao_replace (
-          TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *value,
-          TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert (
+      _tao_any,
+      TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+      TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
-    const CORBA::Any &any,
-    TAO_Default_ORT::ObjectReferenceTemplate *&value
+    const CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    CORBA::Boolean result =
-      type->equivalent (
-          TAO_Default_ORT::_tc_ObjectReferenceTemplate
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (any.any_owns_data ())
-      {
-        const TAO_Default_ORT::ObjectReferenceTemplate *const_holder =
-          ACE_static_cast (
-              const TAO_Default_ORT::ObjectReferenceTemplate *,
-              any.value ()
-            );
-        value =
-          ACE_const_cast (
-              TAO_Default_ORT::ObjectReferenceTemplate *,
-              const_holder
-            );
-        return 1;
-      }
-    else
-      {
-        TAO_Default_ORT::ObjectReferenceTemplate *tmp;
-        TAO_InputCDR stream (
-            any._tao_get_cdr (),
-            any._tao_byte_order ()
-          );
-
-        if (stream >> tmp)
-          {
-            ((CORBA::Any *)&any)->_tao_replace (
-                TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-                1,
-                ACE_static_cast (void *, tmp),
-                TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor
-              );
-            value = tmp;
-            return 1;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract (
+        _tao_any,
+        TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+        TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>
+  template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>;
+  template class TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>
+#  pragma instantiate TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:742
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
 
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
@@ -553,7 +502,7 @@ CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_cs.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -582,7 +531,7 @@ operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/marshal_cs.cpp:44
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
@@ -613,3 +562,4 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
       return 0;
     }
 }
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index 53aab7bbff6..44b931e3a81 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -19,9 +19,8 @@
 // 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_ORIG_DEFAULT_ORTC_H_
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
@@ -38,13 +37,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO
+#define TAO_EXPORT_MACRO 
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
+#  define TAO_EXPORT_NESTED_MACRO 
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -59,30 +58,29 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
+  
   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_
-
+  
   // TAO_IDL - Generated from
-  // be/be_valuetype.cpp:182
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
+  
   class  ObjectReferenceTemplate_var
   {
   public:
@@ -91,38 +89,37 @@ TAO_NAMESPACE  TAO_Default_ORT
     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
+    // 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
-  // be/be_valuetype.cpp:491
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+  
   class  ObjectReferenceTemplate_out
   {
   public:
@@ -135,121 +132,122 @@ TAO_NAMESPACE  TAO_Default_ORT
     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 */
 
-
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class  ObjectReferenceTemplate
-    : public virtual PortableInterceptor::ObjectReferenceTemplate,
-      public virtual CORBA_ValueBase
-
-{
-public:
-  typedef ObjectReferenceTemplate_var _var_type;
-  static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
-  // The address of static _downcast is implicit used as type id
-
-  // (TAO extensions or internals)
-  static CORBA::Boolean _tao_unmarshal (
-      TAO_InputCDR &,
-      ObjectReferenceTemplate *&
-    );
-  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
-  // be/be_visitor_valuetype/valuetype_ch.cpp:304
-
-protected:
-  ObjectReferenceTemplate (void);
-  virtual ~ObjectReferenceTemplate (void);
-
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+    : public virtual PortableInterceptor::ObjectReferenceTemplate
+  {
+  public:
+    typedef ObjectReferenceTemplate_var _var_type;
+    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
+    // The address of static _downcast is implicit used as type id
+
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ObjectReferenceTemplate *&
+      );
+    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:315
+  
+  protected:
+    ObjectReferenceTemplate (void);
+    virtual ~ObjectReferenceTemplate (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (
-      ptr_arith_t
-    );
+    virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-private:
-  ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-  void operator= (const ObjectReferenceTemplate &);
-
-protected:
-  virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
-  virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
-
-};
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    
+  private:
+    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+    void operator= (const ObjectReferenceTemplate &);
+    
+  protected:
+    virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
+    virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
+  };
 
 #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
-// be/be_visitor_typecode/typecode_decl.cpp:44
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO_Default_ORT
 
-TAO_NAMESPACE  OBV_PortableInterceptor
-{
-}
-TAO_NAMESPACE_CLOSE
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
 
 TAO_NAMESPACE  OBV_TAO_Default_ORT
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
-
+  
   // OBV_ class
   class  ObjectReferenceTemplate
     : public virtual TAO_Default_ORT::ObjectReferenceTemplate
   {
   public:
-
-
+    virtual ~ObjectReferenceTemplate (void);
+    
   protected:
     virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
     virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
     CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-
+  
   private:
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
 
-  }
-TAO_NAMESPACE_CLOSE
+}TAO_NAMESPACE_CLOSE
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-// Any operators for valuetype TAO_Default_ORT::ObjectReferenceTemplate
  void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
  void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
  CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
-#ifndef __ACE_INLINE__
+// 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
-// be/be_valuetype.cpp:684
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
 
 TAO_NAMESPACE CORBA
 {
@@ -259,15 +257,18 @@ TAO_NAMESPACE CORBA
 TAO_NAMESPACE_CLOSE
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ch.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
  CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
  CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
+// 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:1009
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.i"
@@ -283,3 +284,4 @@ 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 297356dcd63..98f2c6fbd2f 100644
--- a/TAO/tao/PortableServer/Default_ORTC.i
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from 
-// be/be_visitor_valuetype/valuetype_ci.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
@@ -37,19 +38,21 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:714
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
 
 #if defined (__ACE_INLINE__)
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
 }
 TAO_NAMESPACE_CLOSE
+
 #endif /*__ACE_INLINE__*/
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ci.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
 
  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_Locator.pidl b/TAO/tao/PortableServer/ImR_Locator.pidl
index 32aff2f4e78..597fbc37e36 100644
--- a/TAO/tao/PortableServer/ImR_Locator.pidl
+++ b/TAO/tao/PortableServer/ImR_Locator.pidl
@@ -81,4 +81,3 @@ module ImplementationRepository
 
 };
 
-#pragma prefix ""
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index 4ab32c78519..4a1362d4cd1 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.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_LocatorC.h"
 
+#include "ImR_LocatorC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,8 @@
 #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__ */
@@ -43,9 +44,8 @@
 #include "ImR_LocatorC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::Locator::_tao_class_id = 0;
 
@@ -92,13 +92,23 @@ tao_ImplementationRepository_Locator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_Locator_marshal (
+    ImplementationRepository::Locator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // ImplementationRepository::Locator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-ImplementationRepository::Locator_var::Locator_var (void) // default constructor
+ImplementationRepository::Locator_var::Locator_var (void)
   : ptr_ (Locator::_nil ())
 {}
 
@@ -108,12 +118,12 @@ ImplementationRepository::Locator_var::ptr (void) const
   return this->ptr_;
 }
 
-ImplementationRepository::Locator_var::Locator_var (const ::ImplementationRepository::Locator_var &p) // copy constructor
+ImplementationRepository::Locator_var::Locator_var (const ::ImplementationRepository::Locator_var &p)
   : TAO_Base_var (),
     ptr_ (Locator::_duplicate (p.ptr ()))
 {}
 
-ImplementationRepository::Locator_var::~Locator_var (void) // destructor
+ImplementationRepository::Locator_var::~Locator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -217,10 +227,11 @@ ImplementationRepository::Locator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // ImplementationRepository::Locator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 ImplementationRepository::Locator_out::Locator_out (Locator_ptr &p)
@@ -229,14 +240,14 @@ ImplementationRepository::Locator_out::Locator_out (Locator_ptr &p)
   this->ptr_ = ::ImplementationRepository::Locator::_nil ();
 }
 
-ImplementationRepository::Locator_out::Locator_out (Locator_var &p) // constructor from _var
+ImplementationRepository::Locator_out::Locator_out (Locator_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::ImplementationRepository::Locator::_nil ();
 }
 
-ImplementationRepository::Locator_out::Locator_out (const ::ImplementationRepository::Locator_out &p) // copy constructor
+ImplementationRepository::Locator_out::Locator_out (const ::ImplementationRepository::Locator_out &p)
   : ptr_ (ACE_const_cast (Locator_out &, p).ptr_)
 {}
 
@@ -267,7 +278,7 @@ ImplementationRepository::Locator_out::operator ::ImplementationRepository::Loca
 }
 
 ::ImplementationRepository::Locator_ptr &
-ImplementationRepository::Locator_out::ptr (void) // ptr
+ImplementationRepository::Locator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -278,12 +289,14 @@ ImplementationRepository::Locator_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -291,36 +304,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    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_Locator_activate_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
+    const char * server_;
+    const char * location_;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (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:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
-
-  const char * server_;
-  const char * location_;
-  
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -336,11 +351,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -388,6 +403,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -395,36 +415,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const char * location
+      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 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_Locator_remove_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
+    const char * server_;
+    const char * location_;
+  };
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
-
-  const char * server_;
-  const char * location_;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -440,11 +462,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -491,6 +513,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -498,36 +525,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const char * location
+      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 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_Locator_shutdown_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
+    const char * server_;
+    const char * location_;
+  };
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
-
-  const char * server_;
-  const char * location_;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -543,11 +572,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -594,6 +623,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -601,36 +635,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const char * location
+      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 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_Locator_server_is_shutting_down_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
+    const char * server_;
+    const char * location_;
+  };
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
-
-  const char * server_;
-  const char * location_;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -646,11 +682,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -697,6 +733,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator : public TAO_ClientRequestInfo_i
 {
 public:
@@ -704,38 +745,42 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      CORBA::Object_ptr object_ref
+      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));
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    void result (::CORBA::ULong result);
+    
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
+    const char * location_;
+    CORBA::Object_ptr object_ref_;
+    
+    ::CORBA::ULong _result;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (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:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::ULong result);
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
-
-  const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    location_ (location),
-    object_ref_ (object_ref)
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * location,
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      location_ (location),
+      object_ref_ (object_ref)
 {}
 
 Dynamic::ParameterList *
@@ -751,11 +796,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::argum
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -808,10 +853,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::resul
 void 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::ULong result)
 {
-  // update the result 
+  // Update the result. 
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator : public TAO_ClientRequestInfo_i
 {
 public:
@@ -819,38 +867,42 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    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_ImplementationRepository_Locator_unregister_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
+    const char * location_;
+    CORBA::Object_ptr object_ref_;
+    
+    ::CORBA::ULong _result;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (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:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::ULong result);
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
-
-  const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    location_ (location),
-    object_ref_ (object_ref)
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * location,
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      location_ (location),
+      object_ref_ (object_ref)
 {}
 
 Dynamic::ParameterList *
@@ -866,11 +918,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -923,14 +975,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::res
 void 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (CORBA::ULong result)
 {
-  // update the result 
+  // Update the result. 
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -944,6 +996,9 @@ ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::_TAO_Locator_Remote_Pr
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -956,8 +1011,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
     , ImplementationRepository::CannotActivate
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -969,14 +1023,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
     }
   };
 
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-  
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -1006,7 +1058,8 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
       
@@ -1054,7 +1107,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
                       
                     )
                 );
-            
             }
           
           _invoke_status =
@@ -1082,8 +1134,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
@@ -1152,10 +1202,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
       
       break;
     }
-  
-  
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1167,8 +1218,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
     , ImplementationRepository::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -1176,14 +1226,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
     }
   };
 
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-  
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -1213,7 +1261,8 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
       
@@ -1261,7 +1310,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
                       
                     )
                 );
-            
             }
           
           _invoke_status =
@@ -1289,8 +1337,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
@@ -1359,10 +1405,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
       
       break;
     }
-  
-  
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1374,8 +1421,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
     , ImplementationRepository::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -1383,14 +1429,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
     }
   };
 
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-  
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -1420,7 +1464,8 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
       
@@ -1468,7 +1513,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
                       
                     )
                 );
-            
             }
           
           _invoke_status =
@@ -1496,8 +1540,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
@@ -1566,10 +1608,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
       
       break;
     }
-  
-  
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shutting_down_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1581,8 +1624,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
     , ImplementationRepository::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -1590,14 +1632,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
     }
   };
 
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-  
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -1627,7 +1667,8 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
       
@@ -1675,7 +1716,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
                       
                     )
                 );
-            
             }
           
           _invoke_status =
@@ -1703,8 +1743,6 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
@@ -1773,10 +1811,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
       
       break;
     }
-  
-  
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_activator (
     CORBA_Object *_collocated_tao_target_,
     const char * location,
@@ -1788,8 +1827,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/AlreadyRegistered:1.0",
@@ -1797,14 +1835,13 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
     }
   };
 
-  CORBA::ULong _tao_retval = 0;
+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,
@@ -1834,7 +1871,8 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
           &_tao_call,
           _collocated_tao_target_,
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
       
@@ -1883,7 +1921,6 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
                     ),
                   _tao_retval
                 );
-            
             }
           
           _invoke_status =
@@ -1913,7 +1950,6 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
               continue;
             }
           
-          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           
           if (!(
@@ -2003,6 +2039,9 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
   return _tao_retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregister_activator (
     CORBA_Object *_collocated_tao_target_,
     const char * location,
@@ -2014,8 +2053,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
     , ImplementationRepository::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -2023,14 +2061,13 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
     }
   };
 
-  CORBA::ULong _tao_retval = 0;
+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,
@@ -2060,7 +2097,8 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
           &_tao_call,
           _collocated_tao_target_,
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
       
@@ -2109,7 +2147,6 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
                     ),
                   _tao_retval
                 );
-            
             }
           
           _invoke_status =
@@ -2139,7 +2176,6 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
               continue;
             }
           
-          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           
           if (!(
@@ -2229,13 +2265,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
   return _tao_retval;
 }
 
-
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -2271,20 +2306,19 @@ ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::~_TAO_Locator_Remote
 
 ImplementationRepository::_TAO_Locator_Proxy_Impl&
 ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::Locator *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::ImplementationRepository::Locator *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::Locator::Locator (int collocated)
 {
@@ -2310,7 +2344,7 @@ ImplementationRepository::Locator::~Locator (void)
 void 
 ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Locator *tmp = ACE_static_cast (Locator*, _tao_void_pointer);
+  Locator *tmp = ACE_static_cast (Locator *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -2504,6 +2538,9 @@ const char* ImplementationRepository::Locator::_interface_repository_id (void) c
   return "IDL:ImplementationRepository/Locator:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::activate_server_in_location (
     const char * server,
     const char * location
@@ -2522,10 +2559,14 @@ void ImplementationRepository::Locator::activate_server_in_location (
   proxy.activate_server_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::remove_server_in_location (
     const char * server,
     const char * location
@@ -2543,10 +2584,14 @@ void ImplementationRepository::Locator::remove_server_in_location (
   proxy.remove_server_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::shutdown_server_in_location (
     const char * server,
     const char * location
@@ -2564,10 +2609,14 @@ void ImplementationRepository::Locator::shutdown_server_in_location (
   proxy.shutdown_server_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::server_is_shutting_down_in_location (
     const char * server,
     const char * location
@@ -2585,10 +2634,14 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_location (
   proxy.server_is_shutting_down_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 CORBA::ULong ImplementationRepository::Locator::register_activator (
     const char * location,
     CORBA::Object_ptr object_ref
@@ -2606,10 +2659,14 @@ CORBA::ULong ImplementationRepository::Locator::register_activator (
   return proxy.register_activator (
       this,
       location,
-      object_ref ACE_ENV_ARG_PARAMETER
+      object_ref
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 CORBA::ULong ImplementationRepository::Locator::unregister_activator (
     const char * location,
     CORBA::Object_ptr object_ref
@@ -2627,17 +2684,17 @@ CORBA::ULong ImplementationRepository::Locator::unregister_activator (
   return proxy.unregister_activator (
       this,
       location,
-      object_ref ACE_ENV_ARG_PARAMETER
+      object_ref
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Locator[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x496d706c), 
@@ -2650,10 +2707,10 @@ static const CORBA::Long _oc_ImplementationRepository_Locator[] =
   ACE_NTOHL (0x61746f72), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Locator:1.0
-  8,
+    8,
   ACE_NTOHL (0x4c6f6361), 
   ACE_NTOHL (0x746f7200),  // name = Locator
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Locator (
     CORBA::tk_objref,
@@ -2672,11 +2729,10 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -2688,26 +2744,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::Locator_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_Locator, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::Locator::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::Locator>::insert (
+      _tao_any,
+      ImplementationRepository::Locator::_tao_any_destructor,
+      ImplementationRepository::_tc_Locator,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -2716,60 +2765,26 @@ operator>>= (
     ImplementationRepository::Locator_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::Locator::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_Locator
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::Locator>::extract (
+        _tao_any,
+        ImplementationRepository::Locator::_tao_any_destructor,
+        ImplementationRepository::_tc_Locator,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_Locator,
-            1,
-            _tao_elem,
-            ImplementationRepository::Locator::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = ImplementationRepository::Locator::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = ImplementationRepository::Locator::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::Locator,ImplementationRepository::Locator_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::Locator>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<ImplementationRepository::Locator,ImplementationRepository::Locator_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::Locator, ImplementationRepository::Locator_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Locator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index a17bc745e00..5011d42e096 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.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_LOCATORC_H_
-#define _TAO_IDL_IMR_LOCATORC_H_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORC_H_
+#define _TAO_IDL_ORIG_IMR_LOCATORC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -60,51 +59,49 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___PTR_CH_
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export Locator_var : public TAO_Base_var
   {
   public:
     Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -115,7 +112,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Locator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -123,17 +120,14 @@ TAO_NAMESPACE  ImplementationRepository
     Locator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export Locator_out
   {
   public:
@@ -146,27 +140,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator Locator_ptr &();
     Locator_ptr &ptr (void);
     Locator_ptr operator-> (void);
-
+  
   private:
     Locator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_
-
-  // Forward Classes Declaration.
+  
   class _TAO_Locator_Proxy_Impl;
   class _TAO_Locator_Remote_Proxy_Impl;
   class _TAO_Locator_Proxy_Broker;
   class _TAO_Locator_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual ImplementationRepository::Administration
   {
@@ -174,30 +165,30 @@ TAO_NAMESPACE  ImplementationRepository
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Locator_ptr _duplicate (Locator_ptr obj);
-
+    
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _nil (void)
       {
         return (Locator_ptr)0;
       }
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_server_in_location (
         const char * server,
         const char * location
@@ -208,10 +199,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove_server_in_location (
         const char * server,
         const char * location
@@ -221,10 +212,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown_server_in_location (
         const char * server,
         const char * location
@@ -234,10 +225,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_shutting_down_in_location (
         const char * server,
         const char * location
@@ -247,10 +238,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong register_activator (
         const char * location,
         CORBA::Object_ptr object_ref
@@ -260,10 +251,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong unregister_activator (
         const char * location,
         CORBA::Object_ptr object_ref
@@ -273,61 +264,66 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     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_Locator_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
-
+  
   protected:
     Locator (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Locator_setup_collocation (int collocated);
-
+    
     Locator (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     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 &);
     void operator= (const Locator &);
   };
-
+  
   // 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
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_Locator_Proxy_Impl
     : public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl
   {
   public:
-    virtual ~_TAO_Locator_Proxy_Impl (void) { }
+    virtual ~_TAO_Locator_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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -339,7 +335,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 remove_server_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -350,7 +349,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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -361,7 +363,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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -372,7 +377,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 CORBA::ULong register_activator (
         CORBA_Object *_collocated_tao_target_,
         const char * location,
@@ -383,7 +391,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 CORBA::ULong unregister_activator (
         CORBA_Object *_collocated_tao_target_,
         const char * location,
@@ -394,24 +405,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
-
+  
   protected:
     _TAO_Locator_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Impl
     : public virtual _TAO_Locator_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -419,8 +429,12 @@ TAO_NAMESPACE  ImplementationRepository
   {
   public:
     _TAO_Locator_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_Locator_Remote_Proxy_Impl (void) { }
+    
+    virtual ~_TAO_Locator_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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -432,7 +446,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 remove_server_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -443,7 +460,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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -454,7 +474,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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -465,7 +488,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 CORBA::ULong register_activator (
         CORBA_Object *_collocated_tao_target_,
         const char * location,
@@ -476,7 +502,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 CORBA::ULong unregister_activator (
         CORBA_Object *_collocated_tao_target_,
         const char * location,
@@ -487,27 +516,24 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
-
   };
-
+  
   //
   //             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
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_Locator_Proxy_Broker
   {
   public:
@@ -516,62 +542,60 @@ TAO_NAMESPACE  ImplementationRepository
         Locator *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Locator_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
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Broker
     : public virtual _TAO_Locator_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Locator_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Locator_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Locator_Proxy_Impl &select_proxy (
         Locator *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Locator_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_Locator_Remote_Proxy_Broker *the_TAO_Locator_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
@@ -579,7 +603,7 @@ TAO_NAMESPACE_CLOSE // module ImplementationRepository
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:79
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_PortableServer_Export
 ImplementationRepository::_TAO_Locator_Proxy_Broker *
@@ -587,28 +611,31 @@ ImplementationRepository::_TAO_Locator_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface ImplementationRepository::Locator
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Locator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Locator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Locator_ptr &);
 
-#ifndef __ACE_INLINE__
+// 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
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Locator_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Locator_ptr &);
 
+// 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:1009
 
 #if defined (__ACE_INLINE__)
 #include "ImR_LocatorC.i"
@@ -624,3 +651,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i
index fe4e4ce290c..4f77a602b16 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.i
+++ b/TAO/tao/PortableServer/ImR_LocatorC.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___CI_
@@ -36,11 +37,17 @@ ImplementationRepository::Locator::Locator (
   this->ImplementationRepository_Locator_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::Locator::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index e4d75e46687..e8fa03e6032 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -21,13 +21,13 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:663
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
 
-#ifndef _TAO_IDL_IMR_LOCATORS_CPP_
-#define _TAO_IDL_IMR_LOCATORS_CPP_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
 
-#include "ImR_LocatorS.h"
 
+#include "ImR_LocatorS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -35,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -44,6 +43,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -52,8 +52,10 @@
 #include "ImR_LocatorS.i"
 #endif /* !defined INLINE */
 
+
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1694
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -62,8 +64,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/doctmp/pgontla/ImR/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -189,9 +192,13 @@ TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::lookup (const char *s
 static TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable tao_ImplementationRepository_Locator_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -200,36 +207,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location &
@@ -241,17 +248,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -271,14 +282,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -315,7 +326,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -351,6 +361,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -359,36 +372,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location &
@@ -400,17 +413,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -430,14 +447,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -473,7 +490,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -509,6 +525,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -517,36 +536,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &
@@ -558,17 +577,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -588,14 +611,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -631,7 +654,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -667,6 +689,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -675,36 +700,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &
@@ -716,17 +741,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -746,14 +775,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -789,7 +818,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -825,6 +853,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator : public TAO_ServerRequestInfo
 {
 public:
@@ -833,37 +864,37 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-void result (CORBA::ULong result);
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (CORBA::ULong result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
@@ -876,17 +907,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
+  CORBA::Object_ptr object_ref_;CORBA::ULong _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED
+    CORBA::Object_ptr object_ref
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -906,14 +941,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::argum
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -949,7 +984,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::excep
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -996,6 +1030,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::resul
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator : public TAO_ServerRequestInfo
 {
 public:
@@ -1004,37 +1041,37 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-void result (CORBA::ULong result);
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (CORBA::ULong result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
@@ -1047,17 +1084,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
+  CORBA::Object_ptr object_ref_;CORBA::ULong _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED
+    CORBA::Object_ptr object_ref
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1077,14 +1118,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -1120,7 +1161,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1174,7 +1214,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Locator_Strategized_Proxy_Broker (void)
@@ -1186,8 +1226,9 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *POA_Impleme
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::_TAO_Locator_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-  
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::~_TAO_Locator_Strategized_Proxy_Broker (void)
@@ -1200,7 +1241,6 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::~_TAO_Locat
       // for details..
       this->proxy_cache_[i] = 0;
     }
-  
 }
 
 ImplementationRepository::_TAO_Locator_Proxy_Impl&
@@ -1211,16 +1251,17 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::select_prox
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
   
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
+    {
+      return *this->proxy_cache_[strategy];
+    }
   
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
   
   return *this->proxy_cache_[strategy];
-  
 }
 
 void 
@@ -1262,20 +1303,16 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::create_prox
           );
           ACE_CHECK;
           break;
-        
-      }
-    
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:599
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_Locator_Proxy_Broker *
 ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -1302,13 +1339,16 @@ static int ImplementationRepository__TAO_Locator_Proxy_Broker_Stub_Factory_Initi
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1321,6 +1361,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_ser
     , ImplementationRepository::CannotActivate
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1344,11 +1385,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_ser
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->activate_server_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1360,6 +1406,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_serve
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1383,11 +1430,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_serve
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->remove_server_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1399,6 +1451,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_ser
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1422,11 +1475,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_ser
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->shutdown_server_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_location (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -1438,6 +1496,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_sh
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1461,11 +1520,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_sh
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->server_is_shutting_down_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
     CORBA_Object *_collocated_tao_target_,
     const char * location,
@@ -1502,11 +1566,16 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::regi
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->register_activator (
+        
         location,
-        object_ref ACE_ENV_ARG_PARAMETER
+        object_ref
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
     CORBA_Object *_collocated_tao_target_,
     const char * location,
@@ -1543,16 +1612,14 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unre
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->unregister_activator (
+        
         location,
-        object_ref ACE_ENV_ARG_PARAMETER
+        object_ref
+        ACE_ENV_ARG_PARAMETER
       );
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -1570,14 +1637,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_serv
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->activate_server_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1591,14 +1659,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->remove_server_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1612,14 +1681,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_serv
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->shutdown_server_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1633,14 +1703,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shu
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->server_is_shutting_down_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1654,14 +1725,15 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::regis
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::AlreadyRegistered
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->register_activator (
+          
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1675,14 +1747,15 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unreg
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->unregister_activator (
+          
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1692,8 +1765,9 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unreg
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
+
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:98
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::Locator::Locator (void)
 {
@@ -1710,7 +1784,7 @@ POA_ImplementationRepository::Locator::~Locator (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1726,14 +1800,15 @@ void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -1748,8 +1823,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -1767,11 +1845,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->activate_server_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -1837,7 +1918,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1853,14 +1934,15 @@ void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -1875,8 +1957,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -1894,11 +1979,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->remove_server_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -1964,7 +2052,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1980,14 +2068,15 @@ void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2002,8 +2091,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2021,11 +2113,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->shutdown_server_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2091,7 +2186,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2107,14 +2202,15 @@ void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2129,8 +2225,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2148,11 +2247,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->server_is_shutting_down_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2218,7 +2320,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::register_activator_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2236,12 +2338,12 @@ void POA_ImplementationRepository::Locator::register_activator_skel (
   CORBA::ULong _tao_retval = 0;
   CORBA::String_var location;
   CORBA::Object_var object_ref;
+  
   if (!(
-    (_tao_in >> location.out ()) &&
-    (_tao_in >> object_ref.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> location.out ()) &&
+      (_tao_in >> object_ref.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2256,8 +2358,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       location.in (),
-      object_ref.in () ACE_ENV_ARG_PARAMETER
+      
+      object_ref.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2275,11 +2380,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             _tao_retval = 
             _tao_impl->register_activator (
+                
                 location.in (),
-                object_ref.in () ACE_ENV_ARG_PARAMETER
+                
+                object_ref.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2345,16 +2453,16 @@ ACE_THROW (CORBA::MARSHAL ());
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   
   if (!(
-(_tao_out << _tao_retval)
+      (_tao_out << _tao_retval)
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::unregister_activator_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2372,12 +2480,12 @@ void POA_ImplementationRepository::Locator::unregister_activator_skel (
   CORBA::ULong _tao_retval = 0;
   CORBA::String_var location;
   CORBA::Object_var object_ref;
+  
   if (!(
-    (_tao_in >> location.out ()) &&
-    (_tao_in >> object_ref.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> location.out ()) &&
+      (_tao_in >> object_ref.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2392,8 +2500,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       location.in (),
-      object_ref.in () ACE_ENV_ARG_PARAMETER
+      
+      object_ref.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2411,11 +2522,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             _tao_retval = 
             _tao_impl->unregister_activator (
+                
                 location.in (),
-                object_ref.in () ACE_ENV_ARG_PARAMETER
+                
+                object_ref.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2481,16 +2595,16 @@ ACE_THROW (CORBA::MARSHAL ());
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   
   if (!(
-(_tao_out << _tao_retval)
+      (_tao_out << _tao_retval)
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:163
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::Locator::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -2503,6 +2617,7 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
   POA_ImplementationRepository::Locator *_tao_impl = (POA_ImplementationRepository::Locator *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
   
@@ -2511,6 +2626,7 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
   
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2529,6 +2645,7 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
   
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2596,6 +2713,7 @@ void POA_ImplementationRepository::Locator::_component_skel (
   
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << _tao_retval._retn ()))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2659,7 +2777,7 @@ const char* POA_ImplementationRepository::Locator::_interface_repository_id (voi
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:533
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
 
 void POA_ImplementationRepository::Locator::_dispatch (
     TAO_ServerRequest &req,
@@ -2674,7 +2792,7 @@ void POA_ImplementationRepository::Locator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:479
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
 ImplementationRepository::Locator *
 POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -2714,7 +2832,4 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
   (void) safe_stub.release ();
   return ::ImplementationRepository::Locator::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h
index 0df99af9393..5bdf42cb54d 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS.h
@@ -19,18 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:433
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
 
-#ifndef _TAO_IDL_IMR_LOCATORS_H_
-#define _TAO_IDL_IMR_LOCATORS_H_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_H_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_H_
 
 #include "ace/pre.h"
 #include "ImplRepoS.h"
 #include "ImR_LocatorC.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -53,16 +51,16 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:46
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
 TAO_NAMESPACE  POA_ImplementationRepository
 {
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:82
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
   
   class Locator;
   typedef Locator *Locator_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_Locator_ThruPOA_Proxy_Impl;
   class _TAO_Locator_Direct_Proxy_Impl;
   class _TAO_Locator_Strategized_Proxy_Broker;
@@ -72,63 +70,62 @@ TAO_NAMESPACE  POA_ImplementationRepository
   {
   protected:
     Locator (void);
-
+  
   public:
     Locator (const Locator& rhs);
     virtual ~Locator (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::Locator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void activate_server_in_location (
         const char * server,
@@ -147,8 +144,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void remove_server_in_location (
         const char * server,
@@ -166,8 +164,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void shutdown_server_in_location (
         const char * server,
@@ -185,8 +184,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void server_is_shutting_down_in_location (
         const char * server,
@@ -204,8 +204,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong register_activator (
         const char * location,
@@ -223,8 +224,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong unregister_activator (
         const char * location,
@@ -242,9 +244,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void activate_server_skel (
         TAO_ServerRequest &req, 
@@ -252,9 +254,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void activate_server_with_startup_skel (
         TAO_ServerRequest &req, 
@@ -262,9 +264,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void register_server_skel (
         TAO_ServerRequest &req, 
@@ -272,9 +274,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void reregister_server_skel (
         TAO_ServerRequest &req, 
@@ -282,9 +284,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void remove_server_skel (
         TAO_ServerRequest &req, 
@@ -292,9 +294,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void shutdown_server_skel (
         TAO_ServerRequest &req, 
@@ -302,9 +304,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void server_is_running_skel (
         TAO_ServerRequest &req, 
@@ -312,9 +314,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void server_is_shutting_down_skel (
         TAO_ServerRequest &req, 
@@ -322,9 +324,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void find_skel (
         TAO_ServerRequest &req, 
@@ -332,9 +334,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void list_skel (
         TAO_ServerRequest &req, 
@@ -342,17 +344,14 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-
-  };
-
+  };  
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
   
   class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Locator_Proxy_Broker
   {
@@ -389,7 +388,6 @@ TAO_NAMESPACE  POA_ImplementationRepository
     static _TAO_Locator_Strategized_Proxy_Broker *the_TAO_Locator_Strategized_Proxy_Broker (void);
   };
   
-  
   //
   //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
@@ -400,7 +398,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl : 
     public virtual ::ImplementationRepository::_TAO_Locator_Proxy_Impl,
@@ -410,7 +408,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
   public:
     _TAO_Locator_ThruPOA_Proxy_Impl (void);
     
-    virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) { }
+    virtual ~_TAO_Locator_ThruPOA_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_in_location (
         CORBA_Object *_collocated_tao_target_,
@@ -424,6 +425,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void remove_server_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -435,6 +439,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , 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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -446,6 +453,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , 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_in_location (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -457,6 +467,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong register_activator (
         CORBA_Object *_collocated_tao_target_,
         const char * location,
@@ -468,6 +481,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong unregister_activator (
         CORBA_Object *_collocated_tao_target_,
         const char * location,
@@ -478,15 +494,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
-    
   };
   
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
@@ -500,7 +512,10 @@ class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl :
 public:
   _TAO_Locator_Direct_Proxy_Impl (void);
   
-  virtual ~_TAO_Locator_Direct_Proxy_Impl (void) { }
+  virtual ~_TAO_Locator_Direct_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_in_location (
       CORBA_Object *_collocated_tao_target_,
@@ -514,6 +529,9 @@ public:
       , ImplementationRepository::CannotActivate
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual void remove_server_in_location (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -525,6 +543,9 @@ public:
       , 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_in_location (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -536,6 +557,9 @@ public:
       , 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_in_location (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -547,6 +571,9 @@ public:
       , ImplementationRepository::NotFound
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual CORBA::ULong register_activator (
       CORBA_Object *_collocated_tao_target_,
       const char * location,
@@ -558,6 +585,9 @@ public:
       , ImplementationRepository::AlreadyRegistered
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual CORBA::ULong unregister_activator (
       CORBA_Object *_collocated_tao_target_,
       const char * location,
@@ -567,9 +597,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
       , ImplementationRepository::NotFound
-    ));
-  
-  };
+    ));};
 
 
 //
@@ -579,14 +607,13 @@ public:
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:81
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1038
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
 
 #include "ImR_LocatorS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.i b/TAO/tao/PortableServer/ImR_LocatorS.i
index 63052669d28..f8328837605 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.i
+++ b/TAO/tao/PortableServer/ImR_LocatorS.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_skel (
     TAO_ServerRequest &req,
@@ -37,8 +38,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_with_startup_skel (
     TAO_ServerRequest &req,
@@ -55,8 +57,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_with_star
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::register_server_skel (
     TAO_ServerRequest &req,
@@ -73,8 +76,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::register_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::reregister_server_skel (
     TAO_ServerRequest &req,
@@ -91,8 +95,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::reregister_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::remove_server_skel (
     TAO_ServerRequest &req,
@@ -109,8 +114,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::remove_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::shutdown_server_skel (
     TAO_ServerRequest &req,
@@ -127,8 +133,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::shutdown_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::server_is_running_skel (
     TAO_ServerRequest &req,
@@ -145,8 +152,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::server_is_running_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::server_is_shutting_down_skel (
     TAO_ServerRequest &req,
@@ -163,8 +171,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::server_is_shutting_down_s
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::find_skel (
     TAO_ServerRequest &req,
@@ -181,8 +190,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::find_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::list_skel (
     TAO_ServerRequest &req,
@@ -199,3 +209,4 @@ ACE_INLINE void POA_ImplementationRepository::Locator::list_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.cpp b/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
index 70efeaba4dc..3b32af55826 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.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:770
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
 
-#ifndef _TAO_IDL_IMR_LOCATORS_T_CPP_
-#define _TAO_IDL_IMR_LOCATORS_T_CPP_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_T_CPP_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_T_CPP_
 
 #include "ImR_LocatorS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.h b/TAO/tao/PortableServer/ImR_LocatorS_T.h
index 252627d8f5b..bf75e581318 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.h
@@ -19,14 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:597
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
 
-#ifndef _TAO_IDL_IMR_LOCATORS_T_H_
-#define _TAO_IDL_IMR_LOCATORS_T_H_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_T_H_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -34,11 +34,16 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_ImplementationRepository
 {
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/tie_sh.cpp:89
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -49,9 +54,13 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // the T& ctor
     Locator_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    Locator_tie (T *tp, CORBA::Boolean release=1);
+    Locator_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    Locator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    Locator_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~Locator_tie (void);
     // dtor
@@ -61,7 +70,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -72,6 +81,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     void activate_server_in_location (
         const char * server,
         const char * location
@@ -83,7 +96,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        void remove_server_in_location (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void remove_server_in_location (
         const char * server,
         const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -93,7 +109,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void shutdown_server_in_location (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void shutdown_server_in_location (
         const char * server,
         const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -103,7 +122,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void server_is_shutting_down_in_location (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void server_is_shutting_down_in_location (
         const char * server,
         const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -113,7 +135,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        CORBA::ULong register_activator (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    CORBA::ULong register_activator (
         const char * location,
         CORBA::Object_ptr object_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -123,7 +148,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
-        CORBA::ULong unregister_activator (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    CORBA::ULong unregister_activator (
         const char * location,
         CORBA::Object_ptr object_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -133,7 +161,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void activate_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -143,7 +174,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        char * activate_server_with_startup (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    char * activate_server_with_startup (
         const char * server,
         CORBA::Long check_startup
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -154,7 +188,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        void register_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -164,7 +201,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
-        void reregister_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -173,7 +213,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
       ));
     
-        void remove_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -182,7 +225,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void shutdown_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -191,7 +237,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        char * server_is_running (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    char * server_is_running (
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
@@ -202,7 +251,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void server_is_shutting_down (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -211,7 +263,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void find (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -221,7 +276,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void list (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -230,8 +288,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -240,26 +298,21 @@ TAO_NAMESPACE  POA_ImplementationRepository
     Locator_tie (const Locator_tie &);
     void operator= (const Locator_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 #endif /* ACE_HAS_USING_KEYWORD */
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1135
-
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
 
 #if defined (__ACE_INLINE__)
 #include "ImR_LocatorS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ImR_LocatorS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("ImR_LocatorS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.i b/TAO/tao/PortableServer/ImR_LocatorS_T.i
index 7fe2708d636..050e64e1084 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.i
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.i
@@ -19,14 +19,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/tie_si.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-// TAO_IDL - Generated from be/be_visitor_interface/tie_si.cpp:105
-
-
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Locator_tie<T>::Locator_tie (T &t)
 	: ptr_ (&t),
@@ -58,7 +56,10 @@ POA_ImplementationRepository::Locator_tie<T>::Locator_tie (T *tp, PortableServer
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Locator_tie<T>::~Locator_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -70,7 +71,11 @@ POA_ImplementationRepository::Locator_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::Locator_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -78,7 +83,11 @@ POA_ImplementationRepository::Locator_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::Locator_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -99,11 +108,16 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_ImplementationRepository::Locator_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->Locator::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location  (
     const char * server,
@@ -117,11 +131,15 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location
   ))
 {
   this->ptr_->activate_server_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
     const char * server,
@@ -134,11 +152,15 @@ void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
   ))
 {
   this->ptr_->remove_server_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location  (
     const char * server,
@@ -151,11 +173,15 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location
   ))
 {
   this->ptr_->shutdown_server_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_location  (
     const char * server,
@@ -168,11 +194,15 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_lo
   ))
 {
   this->ptr_->server_is_shutting_down_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
     const char * location,
@@ -185,11 +215,15 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
   ))
 {
   return this->ptr_->register_activator (
-location,
-    object_ref ACE_ENV_ARG_PARAMETER
+    location,
+    object_ref
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator  (
     const char * location,
@@ -202,11 +236,15 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator
   ))
 {
   return this->ptr_->unregister_activator (
-location,
-    object_ref ACE_ENV_ARG_PARAMETER
+    location,
+    object_ref
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
     const char * server
@@ -219,10 +257,14 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
   ))
 {
   this->ptr_->activate_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startup  (
     const char * server,
@@ -236,11 +278,15 @@ char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startu
   ))
 {
   return this->ptr_->activate_server_with_startup (
-server,
-    check_startup ACE_ENV_ARG_PARAMETER
+    server,
+    check_startup
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::register_server  (
     const char * server,
@@ -253,11 +299,15 @@ void POA_ImplementationRepository::Locator_tie<T>::register_server  (
   ))
 {
   this->ptr_->register_server (
-server,
-    options ACE_ENV_ARG_PARAMETER
+    server,
+    options
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
     const char * server,
@@ -269,11 +319,15 @@ void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
   ))
 {
   this->ptr_->reregister_server (
-server,
-    options ACE_ENV_ARG_PARAMETER
+    server,
+    options
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
     const char * server
@@ -285,10 +339,14 @@ void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
   ))
 {
   this->ptr_->remove_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
     const char * server
@@ -300,10 +358,14 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
   ))
 {
   this->ptr_->shutdown_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
     const char * server,
@@ -317,12 +379,16 @@ char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
   ))
 {
   return this->ptr_->server_is_running (
-server,
+    server,
     addr,
-    server_object ACE_ENV_ARG_PARAMETER
+    server_object
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
     const char * server
@@ -334,10 +400,14 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
   ))
 {
   this->ptr_->server_is_shutting_down (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::find  (
     const char * server,
@@ -350,11 +420,15 @@ void POA_ImplementationRepository::Locator_tie<T>::find  (
   ))
 {
   this->ptr_->find (
-server,
-    info ACE_ENV_ARG_PARAMETER
+    server,
+    info
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::list  (
     CORBA::ULong how_many,
@@ -367,9 +441,10 @@ void POA_ImplementationRepository::Locator_tie<T>::list  (
   ))
 {
   this->ptr_->list (
-how_many,
+    how_many,
     server_list,
-    server_iterator ACE_ENV_ARG_PARAMETER
+    server_iterator
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index b0499ac0fc3..a1ee59cd246 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ImplRepoC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "ImplRepoC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #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__ */
@@ -39,9 +44,8 @@
 #include "ImplRepoC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::ServerObject::_tao_class_id = 0;
 
@@ -88,13 +92,23 @@ tao_ImplementationRepository_ServerObject_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_ServerObject_marshal (
+    ImplementationRepository::ServerObject_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // ImplementationRepository::ServerObject_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-ImplementationRepository::ServerObject_var::ServerObject_var (void) // default constructor
+ImplementationRepository::ServerObject_var::ServerObject_var (void)
   : ptr_ (ServerObject::_nil ())
 {}
 
@@ -104,12 +118,12 @@ ImplementationRepository::ServerObject_var::ptr (void) const
   return this->ptr_;
 }
 
-ImplementationRepository::ServerObject_var::ServerObject_var (const ::ImplementationRepository::ServerObject_var &p) // copy constructor
+ImplementationRepository::ServerObject_var::ServerObject_var (const ::ImplementationRepository::ServerObject_var &p)
   : TAO_Base_var (),
     ptr_ (ServerObject::_duplicate (p.ptr ()))
 {}
 
-ImplementationRepository::ServerObject_var::~ServerObject_var (void) // destructor
+ImplementationRepository::ServerObject_var::~ServerObject_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -138,7 +152,7 @@ ImplementationRepository::ServerObject_var::operator const ::ImplementationRepos
   return this->ptr_;
 }
 
-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast
+ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -213,10 +227,11 @@ ImplementationRepository::ServerObject_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // ImplementationRepository::ServerObject_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &p)
@@ -225,14 +240,14 @@ ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &
   this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
 }
 
-ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_var &p) // constructor from _var
+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) // copy constructor
+ImplementationRepository::ServerObject_out::ServerObject_out (const ::ImplementationRepository::ServerObject_out &p)
   : ptr_ (ACE_const_cast (ServerObject_out &, p).ptr_)
 {}
 
@@ -263,7 +278,7 @@ ImplementationRepository::ServerObject_out::operator ::ImplementationRepository:
 }
 
 ::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_out::ptr (void) // ptr
+ImplementationRepository::ServerObject_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -274,37 +289,45 @@ ImplementationRepository::ServerObject_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target 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_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
-
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      CORBA::Object_ptr _tao_target
+      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_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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
@@ -315,9 +338,8 @@ 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;
-
 }
 
 Dynamic::ExceptionList *
@@ -328,11 +350,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))
 {
@@ -341,39 +363,46 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target 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_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      CORBA::Object_ptr _tao_target
+      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_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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
@@ -384,9 +413,8 @@ 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;
-
 }
 
 Dynamic::ExceptionList *
@@ -397,11 +425,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))
 {
@@ -410,14 +438,19 @@ 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;
 }
 
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// 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)
@@ -428,6 +461,9 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -436,15 +472,13 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
     CORBA::SystemException
   ))
 {
-
-
-
-
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "ping",
@@ -452,133 +486,161 @@ 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,
-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -587,15 +649,13 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
     CORBA::SystemException
   ))
 {
-
-
-
-
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown",
@@ -603,138 +663,164 @@ 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,
-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
-
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -770,30 +856,25 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObj
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
 ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::ServerObject *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::ImplementationRepository::ServerObject *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:198
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::ServerObject::ServerObject (int collocated)
 {
   this->ImplementationRepository_ServerObject_setup_collocation (collocated);
 }
 
-ImplementationRepository::ServerObject::~ServerObject (void)
-{}
-
 void
 ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_setup_collocation (int collocated)
 {
@@ -805,44 +886,67 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
       ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::the_TAO_ServerObject_Remote_Proxy_Broker ();
 }
 
-void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
+ImplementationRepository::ServerObject::~ServerObject (void)
+{}
+
+void 
+ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServerObject *tmp = ACE_static_cast (ServerObject*, _tao_void_pointer);
+  ServerObject *tmp = ACE_static_cast (ServerObject *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow (
+ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerObject::_nil ();
+    {
+      return ServerObject::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:ImplementationRepository/ServerObject:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (ServerObject::_nil ());
+      
       if (is_a == 0)
-        return ServerObject::_nil ();
+        {
+          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
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerObject::_nil ();
+    {
+      return ServerObject::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      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 () &&
@@ -860,7 +964,7 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
               ServerObject::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -873,56 +977,89 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
               ServerObject::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerObject_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerObject::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerObject::_tao_class_id
+                )
+            )
         );
 }
 
 ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+ImplementationRepository::ServerObject::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:ImplementationRepository/ServerObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->CORBA_Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_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;
 }
 
@@ -931,62 +1068,71 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo
   return "IDL:ImplementationRepository/ServerObject:1.0";
 }
 
-void ImplementationRepository::ServerObject::ping (
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
+void ImplementationRepository::ServerObject::ping (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     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
+      this
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
-void ImplementationRepository::ServerObject::shutdown (
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
+void ImplementationRepository::ServerObject::shutdown (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     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
+      this
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    13,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = ServerObject
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject (
     CORBA::tk_objref,
@@ -998,13 +1144,16 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerObject, &_tc_TAO_tc_ImplementationRepository_ServerObject)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerObject,
+    &_tc_TAO_tc_ImplementationRepository_ServerObject
+  )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// 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
 
-// Default constructor.
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
   : CORBA_UserException (
         "IDL:ImplementationRepository/AlreadyRegistered:1.0",
@@ -1013,12 +1162,10 @@ ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 ImplementationRepository::AlreadyRegistered::~AlreadyRegistered (void)
 {
 }
 
-// Copy constructor.
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -1027,7 +1174,6 @@ ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::Implemen
 {
 }
 
-// Assignment operator.
 ImplementationRepository::AlreadyRegistered&
 ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
 {
@@ -1042,11 +1188,11 @@ void ImplementationRepository::AlreadyRegistered::_tao_any_destructor (void *_ta
 }
 
 ImplementationRepository::AlreadyRegistered *
-ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception *exc)
+ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/AlreadyRegistered:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/AlreadyRegistered:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AlreadyRegistered *, exc);
+      return ACE_dynamic_cast (AlreadyRegistered *, _tao_excp);
     }
   else
     {
@@ -1073,7 +1219,7 @@ ImplementationRepository::AlreadyRegistered::_tao_duplicate (void) const
   return result;
 }
 
-void ImplementationRepository::AlreadyRegistered::_raise ()
+void ImplementationRepository::AlreadyRegistered::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1087,7 +1233,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1100,35 +1246,44 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_type (void) const
+{
+  return ::ImplementationRepository::_tc_AlreadyRegistered;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    18,
+  ACE_NTOHL (0x416c7265), 
+  ACE_NTOHL (0x61647952), 
+  ACE_NTOHL (0x65676973), 
+  ACE_NTOHL (0x74657265), 
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_AlreadyRegistered (
     CORBA::tk_except,
@@ -1140,20 +1295,16 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_AlreadyRegistered (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AlreadyRegistered, &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AlreadyRegistered,
+    &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_type (void) const
-{
-  return ::ImplementationRepository::_tc_AlreadyRegistered;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/exception_cs.cpp:63
-
-// Default constructor.
 ImplementationRepository::CannotActivate::CannotActivate (void)
   : CORBA_UserException (
         "IDL:ImplementationRepository/CannotActivate:1.0",
@@ -1162,12 +1313,10 @@ ImplementationRepository::CannotActivate::CannotActivate (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 ImplementationRepository::CannotActivate::~CannotActivate (void)
 {
 }
 
-// Copy constructor.
 ImplementationRepository::CannotActivate::CannotActivate (const ::ImplementationRepository::CannotActivate &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -1177,7 +1326,6 @@ ImplementationRepository::CannotActivate::CannotActivate (const ::Implementation
   this->reason = CORBA::string_dup (_tao_excp.reason.in ());
 }
 
-// Assignment operator.
 ImplementationRepository::CannotActivate&
 ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepository::CannotActivate &_tao_excp)
 {
@@ -1193,11 +1341,11 @@ void ImplementationRepository::CannotActivate::_tao_any_destructor (void *_tao_v
 }
 
 ImplementationRepository::CannotActivate *
-ImplementationRepository::CannotActivate::_downcast (CORBA::Exception *exc)
+ImplementationRepository::CannotActivate::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/CannotActivate:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/CannotActivate:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (CannotActivate *, exc);
+      return ACE_dynamic_cast (CannotActivate *, _tao_excp);
     }
   else
     {
@@ -1224,7 +1372,7 @@ ImplementationRepository::CannotActivate::_tao_duplicate (void) const
   return result;
 }
 
-void ImplementationRepository::CannotActivate::_raise ()
+void ImplementationRepository::CannotActivate::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1238,7 +1386,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1251,14 +1399,18 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 ImplementationRepository::CannotActivate::CannotActivate (
     const char * _tao_reason
-  )
-  : CORBA_UserException (
+  )  : CORBA_UserException (
         "IDL:ImplementationRepository/CannotActivate:1.0",
         "CannotActivate"
       )
@@ -1266,32 +1418,41 @@ ImplementationRepository::CannotActivate::CannotActivate (
   this->reason = CORBA::string_dup (_tao_reason);
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_type (void) const
+{
+  return ::ImplementationRepository::_tc_CannotActivate;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    15,
+  ACE_NTOHL (0x43616e6e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697661), 
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
-  7,
-  ACE_NTOHL (0x72656173),
+    7,
+  ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1305,20 +1466,16 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_CannotActivate (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_CannotActivate, &_tc_TAO_tc_ImplementationRepository_CannotActivate)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CannotActivate,
+    &_tc_TAO_tc_ImplementationRepository_CannotActivate
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_type (void) const
-{
-  return ::ImplementationRepository::_tc_CannotActivate;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/exception_cs.cpp:63
-
-// Default constructor.
 ImplementationRepository::NotFound::NotFound (void)
   : CORBA_UserException (
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1327,12 +1484,10 @@ ImplementationRepository::NotFound::NotFound (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 ImplementationRepository::NotFound::~NotFound (void)
 {
 }
 
-// Copy constructor.
 ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::NotFound &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -1341,7 +1496,6 @@ ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::
 {
 }
 
-// Assignment operator.
 ImplementationRepository::NotFound&
 ImplementationRepository::NotFound::operator= (const ::ImplementationRepository::NotFound &_tao_excp)
 {
@@ -1356,11 +1510,11 @@ void ImplementationRepository::NotFound::_tao_any_destructor (void *_tao_void_po
 }
 
 ImplementationRepository::NotFound *
-ImplementationRepository::NotFound::_downcast (CORBA::Exception *exc)
+ImplementationRepository::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/NotFound:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/NotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NotFound *, exc);
+      return ACE_dynamic_cast (NotFound *, _tao_excp);
     }
   else
     {
@@ -1387,7 +1541,7 @@ ImplementationRepository::NotFound::_tao_duplicate (void) const
   return result;
 }
 
-void ImplementationRepository::NotFound::_raise ()
+void ImplementationRepository::NotFound::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1401,7 +1555,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1414,31 +1568,40 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr ImplementationRepository::NotFound::_type (void) const
+{
+  return ::ImplementationRepository::_tc_NotFound;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    9,
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_NotFound (
     CORBA::tk_except,
@@ -1450,50 +1613,50 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_NotFound (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_ImplementationRepository_NotFound)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NotFound,
+    &_tc_TAO_tc_ImplementationRepository_NotFound
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::NotFound::_type (void) const
-{
-  return ::ImplementationRepository::_tc_NotFound;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    20,
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7456), 
+  ACE_NTOHL (0x61726961), 
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
+    5,
+  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
 };
 
@@ -1507,34 +1670,44 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EnvironmentVariable, &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_EnvironmentVariable,
+    &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnvironmentVariable *tmp = ACE_static_cast (EnvironmentVariable*, _tao_void_pointer);
   delete tmp;
 }
 
+// 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
+    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),
+    8,
+  ACE_NTOHL (0x41646472), 
   ACE_NTOHL (0x65737300),  // name = Address
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1548,9 +1721,15 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_ImplementationRepository_Address)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Address,
+    &_tc_TAO_tc_ImplementationRepository_Address
+  )
 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)
 
@@ -1562,18 +1741,23 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 {
   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);
-
-  }
+    {
+      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;
 }
 
@@ -1581,131 +1765,152 @@ 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_);
-
+    {
+      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) // Dtor.
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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
 // *************************************************************
 
 ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
-ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release)
-  :
+
+ImplementationRepository::EnvironmentList::EnvironmentList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor
 {}
+
 void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnvironmentList *tmp = ACE_static_cast (EnvironmentList*, _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_ImplementationRepository_EnvironmentList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    16,
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     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),
+            20,
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e7456), 
+      ACE_NTOHL (0x61726961), 
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
+            5,
+      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,
@@ -1722,46 +1927,53 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EnvironmentList, &_tc_TAO_tc_ImplementationRepository_EnvironmentList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_EnvironmentList,
+    &_tc_TAO_tc_ImplementationRepository_EnvironmentList
+  )
 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_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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode (
     CORBA::tk_enum,
@@ -1773,160 +1985,167 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ActivationMode, &_tc_TAO_tc_ImplementationRepository_ActivationMode)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ActivationMode,
+    &_tc_TAO_tc_ImplementationRepository_ActivationMode
+  )
 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_ImplementationRepository_StartupOptions[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    15,
+  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),
+    13,
+  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
+    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),
+        16,
+    ACE_NTOHL (0x456e7669), 
+    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e744c), 
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       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),
+                20,
+        ACE_NTOHL (0x456e7669), 
+        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7456), 
+        ACE_NTOHL (0x61726961), 
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
+                5,
+        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
+    CORBA::tk_enum, // typecode kind
   136, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
+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
 };
 
@@ -1940,230 +2159,240 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_StartupOptions (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_StartupOptions, &_tc_TAO_tc_ImplementationRepository_StartupOptions)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_StartupOptions,
+    &_tc_TAO_tc_ImplementationRepository_StartupOptions
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_void_pointer)
 {
   StartupOptions *tmp = ACE_static_cast (StartupOptions*, _tao_void_pointer);
   delete tmp;
 }
 
+// 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
+    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),
+    18,
+  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),
+    15,
+  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
+    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),
+        15,
+    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),
+        13,
+    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
+        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),
+            16,
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e744c), 
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_struct, // typecode kind
         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),
+                    20,
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e7456), 
+          ACE_NTOHL (0x61726961), 
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
-          5,
-          ACE_NTOHL (0x6e616d65),
+                    5,
+          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
+        CORBA::tk_enum, // typecode kind
     136, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
+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
+    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),
+        8,
+    ACE_NTOHL (0x41646472), 
     ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -2178,15 +2407,24 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformation (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_ImplementationRepository_ServerInformation)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerInformation,
+    &_tc_TAO_tc_ImplementationRepository_ServerInformation
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformation *tmp = ACE_static_cast (ServerInformation*, _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)
 
@@ -2198,18 +2436,23 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 {
   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);
-
-  }
+    {
+      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;
 }
 
@@ -2217,315 +2460,336 @@ 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_);
-
+    {
+      return;
+    }
+  
+  ImplementationRepository::ServerInformation *tmp =
+    ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // ImplementationRepository::ServerInformationList
 // *************************************************************
 
 ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
-ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release)
-  :
+
+ImplementationRepository::ServerInformationList::ServerInformationList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor
 {}
+
 void ImplementationRepository::ServerInformationList::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationList *tmp = ACE_static_cast (ServerInformationList*, _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_ImplementationRepository_ServerInformationList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    22,
+  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
+    CORBA::tk_sequence, // typecode kind
   852, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     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),
+            18,
+      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),
+            15,
+      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
+            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),
+                15,
+        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),
+                13,
+        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
+                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),
+                    16,
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e744c), 
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             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),
+                            20,
+              ACE_NTOHL (0x456e7669), 
+              ACE_NTOHL (0x726f6e6d), 
+              ACE_NTOHL (0x656e7456), 
+              ACE_NTOHL (0x61726961), 
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
-              5,
-              ACE_NTOHL (0x6e616d65),
+                            5,
+              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
+                CORBA::tk_enum, // typecode kind
         136, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+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
+            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),
+                8,
+        ACE_NTOHL (0x41646472), 
         ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -2543,12 +2807,15 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationList
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerInformationList,
+    &_tc_TAO_tc_ImplementationRepository_ServerInformationList
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::Administration::_tao_class_id = 0;
 
@@ -2595,13 +2862,23 @@ tao_ImplementationRepository_Administration_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_Administration_marshal (
+    ImplementationRepository::Administration_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // ImplementationRepository::Administration_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-ImplementationRepository::Administration_var::Administration_var (void) // default constructor
+ImplementationRepository::Administration_var::Administration_var (void)
   : ptr_ (Administration::_nil ())
 {}
 
@@ -2611,12 +2888,12 @@ ImplementationRepository::Administration_var::ptr (void) const
   return this->ptr_;
 }
 
-ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p) // copy constructor
+ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p)
   : TAO_Base_var (),
     ptr_ (Administration::_duplicate (p.ptr ()))
 {}
 
-ImplementationRepository::Administration_var::~Administration_var (void) // destructor
+ImplementationRepository::Administration_var::~Administration_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2645,7 +2922,7 @@ ImplementationRepository::Administration_var::operator const ::ImplementationRep
   return this->ptr_;
 }
 
-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast
+ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2720,10 +2997,11 @@ ImplementationRepository::Administration_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // ImplementationRepository::Administration_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p)
@@ -2732,14 +3010,14 @@ ImplementationRepository::Administration_out::Administration_out (Administration
   this->ptr_ = ::ImplementationRepository::Administration::_nil ();
 }
 
-ImplementationRepository::Administration_out::Administration_out (Administration_var &p) // constructor from _var
+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) // copy constructor
+ImplementationRepository::Administration_out::Administration_out (const ::ImplementationRepository::Administration_out &p)
   : ptr_ (ACE_const_cast (Administration_out &, p).ptr_)
 {}
 
@@ -2770,7 +3048,7 @@ ImplementationRepository::Administration_out::operator ::ImplementationRepositor
 }
 
 ::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_out::ptr (void) // ptr
+ImplementationRepository::Administration_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2781,41 +3059,49 @@ ImplementationRepository::Administration_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server 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_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-
-  const char * server_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server)
+      const char * server
+      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_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server)
 {}
 
 Dynamic::ParameterList *
@@ -2826,16 +3112,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2847,15 +3132,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)
     {
@@ -2867,7 +3152,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))
 {
@@ -2876,10 +3161,15 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup : public TAO_ClientRequestInfo_i
 {
 public:
@@ -2887,38 +3177,42 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const CORBA::Long & check_startup 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 (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_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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    check_startup_ (check_startup)
+      const CORBA::Long & check_startup
+      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 (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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      check_startup_ (check_startup)
 {}
 
 Dynamic::ParameterList *
@@ -2929,19 +3223,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= check_startup_;
+  
+  (*parameter_list)[len].argument <<= check_startup_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2953,15 +3247,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)
     {
@@ -2973,7 +3267,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))
 {
@@ -2982,20 +3276,23 @@ 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;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo_i
 {
 public:
@@ -3003,36 +3300,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const ImplementationRepository::StartupOptions & options 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_register_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-
-  const char * server_;
-  const ImplementationRepository::StartupOptions & options_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    options_ (options)
+      const ImplementationRepository::StartupOptions & options
+      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_register_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      options_ (options)
 {}
 
 Dynamic::ParameterList *
@@ -3043,19 +3342,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<=  this->options_;
+  
+  (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3067,14 +3366,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)
     {
@@ -3086,7 +3385,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))
 {
@@ -3095,10 +3394,15 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo_i
 {
 public:
@@ -3106,36 +3410,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const ImplementationRepository::StartupOptions & options 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_reregister_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-
-  const char * server_;
-  const ImplementationRepository::StartupOptions & options_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    options_ (options)
+      const ImplementationRepository::StartupOptions & options
+      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_reregister_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      options_ (options)
 {}
 
 Dynamic::ParameterList *
@@ -3146,19 +3452,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<=  this->options_;
+  
+  (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3170,11 +3476,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))
 {
@@ -3183,43 +3489,50 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server 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_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-
-  const char * server_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server)
+      const char * server
+      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_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server)
 {}
 
 Dynamic::ParameterList *
@@ -3230,16 +3543,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3251,14 +3563,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)
     {
@@ -3270,7 +3582,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))
 {
@@ -3279,43 +3591,50 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server 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_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-
-  const char * server_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server)
+      const char * server
+      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_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server)
 {}
 
 Dynamic::ParameterList *
@@ -3326,16 +3645,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3347,14 +3665,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)
     {
@@ -3366,7 +3684,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))
 {
@@ -3375,10 +3693,15 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo_i
 {
 public:
@@ -3387,41 +3710,45 @@ public:
       CORBA::Object_ptr _tao_target,
       const char * server,
       const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object 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 (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_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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    addr_ (addr),
-    server_object_ (server_object)
+      ImplementationRepository::ServerObject_ptr server_object
+      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 (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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      addr_ (addr),
+      server_object_ (server_object)
 {}
 
 Dynamic::ParameterList *
@@ -3432,22 +3759,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= addr_;
+  
+  (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<=  this->server_object_;
+  
+  (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3459,14 +3787,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)
     {
@@ -3478,7 +3806,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))
 {
@@ -3487,53 +3815,58 @@ 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;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ClientRequestInfo_i
 {
 public:
   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_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_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-
-  const char * server_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server)
+      const char * server
+      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_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server)
 {}
 
 Dynamic::ParameterList *
@@ -3544,16 +3877,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3565,14 +3897,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)
     {
@@ -3584,7 +3916,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))
 {
@@ -3593,43 +3925,50 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server 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_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-
-  const char * server_;
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server)
+      const char * server
+      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_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server)
 {}
 
 Dynamic::ParameterList *
@@ -3640,16 +3979,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].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3661,14 +3999,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)
     {
@@ -3680,7 +4018,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))
 {
@@ -3689,46 +4027,53 @@ 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;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
+      const CORBA::ULong & how_many      
 
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
+    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));
 
-  const CORBA::ULong & how_many_;
+  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_;    
 
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  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      
 
-};
-
-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
- ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    how_many_ (how_many)
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      how_many_ (how_many)  
 
 {}
 
@@ -3740,16 +4085,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].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+    
 
   return safe_parameter_list._retn ();
 }
@@ -3762,11 +4106,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))
 {
@@ -3775,14 +4119,19 @@ 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;
 }
 
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// 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)
@@ -3793,6 +4142,9 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -3804,8 +4156,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",
@@ -3817,14 +4168,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     }
   };
 
-
-
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server",
@@ -3832,142 +4182,174 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
       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,
-        _collocated_tao_target_,
-        server ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              (_tao_out << server)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server_with_startup (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -3980,8 +4362,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",
@@ -3993,14 +4374,14 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
     }
   };
 
-  CORBA::String_var _tao_retval;
-
-
+CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-
-
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server_with_startup",
@@ -4008,159 +4389,199 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
       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,
-        _collocated_tao_target_,
-        server,
-        check_startup ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval._retn ());
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server,
+          check_startup
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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 ());
+          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_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server) &&
+              (_tao_out << server) &&
               (_tao_out << check_startup)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-
+              ))
+            {
+              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_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)
-              );
-
+              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_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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_in >> _tao_retval.inout ())
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info = _tao_retval._retn ();
+          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
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval._retn ());
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-return _tao_retval._retn ();
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -4172,8 +4593,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",
@@ -4181,14 +4601,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     }
   };
 
-
-
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_server",
@@ -4196,144 +4615,176 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
       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,
-        _collocated_tao_target_,
-        server,
-        options ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server,
+          options
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server) &&
+              (_tao_out << server) &&
               (_tao_out << options)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              ))
+            {
+              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_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -4344,15 +4795,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
     CORBA::SystemException
   ))
 {
-
-
-
-
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "reregister_server",
@@ -4360,144 +4809,176 @@ 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,
-        _collocated_tao_target_,
-        server,
-        options ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server,
+          options
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server) &&
+              (_tao_out << server) &&
               (_tao_out << options)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -4508,8 +4989,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",
@@ -4517,14 +4997,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     }
   };
 
-
-
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server",
@@ -4532,142 +5011,174 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
       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,
-        _collocated_tao_target_,
-        server ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              (_tao_out << server)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -4678,8 +5189,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",
@@ -4687,14 +5197,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     }
   };
 
-
-
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server",
@@ -4702,143 +5211,174 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
       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,
-        _collocated_tao_target_,
-        server ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              (_tao_out << server)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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_RETURN (
-                CORBA::UNKNOWN (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -4851,8 +5391,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",
@@ -4860,14 +5399,14 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     }
   };
 
-  CORBA::String_var _tao_retval;
-
-
+CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-
-
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_running",
@@ -4875,162 +5414,201 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
       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,
-        _collocated_tao_target_,
-        server,
-        addr,
-        server_object ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval._retn ());
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server,
+          addr,
+          server_object
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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 ());
+          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_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server) &&
+              (_tao_out << server) &&
               (_tao_out << addr) &&
               (_tao_out << server_object)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-
+              ))
+            {
+              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_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
-              );
-
+                  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_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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_in >> _tao_retval.inout ())
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info = _tao_retval._retn ();
+          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
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval._retn ());
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-return _tao_retval._retn ();
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -5041,8 +5619,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",
@@ -5050,14 +5627,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     }
   };
 
-
-
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down",
@@ -5065,142 +5641,174 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
       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,
-        _collocated_tao_target_,
-        server ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              (_tao_out << server)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -5212,8 +5820,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",
@@ -5221,19 +5828,17 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     }
   };
 
-
-
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  ACE_NEW (
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    ACE_NEW (
       info.ptr (),
       ImplementationRepository::ServerInformation
     );
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "find",
@@ -5241,152 +5846,187 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
       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,
-        _collocated_tao_target_,
-        server ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_,
+          server
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << server)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              (_tao_out << server)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                                          (_tao_in >> *info.ptr ())
+          
+          if (!((_tao_in >> *info.ptr ())
               ))
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    )
+                );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
@@ -5398,20 +6038,17 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA::SystemException
   ))
 {
-
-
-
-
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  ACE_NEW (
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    ACE_NEW (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList
     );
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "list",
@@ -5419,159 +6056,192 @@ 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
- ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
+          &_tao_call,
+          _collocated_tao_target_,
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << how_many)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-
+              (_tao_out << how_many)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                                          (_tao_in >> *server_list.ptr ()) &&
+          
+          if (!((_tao_in >> *server_list.ptr ()) &&
               (_tao_in >> server_iterator.ptr ())
               ))
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    )
+                );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
-
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -5607,30 +6277,25 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Adminis
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
 ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::Administration *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::ImplementationRepository::Administration *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:198
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::Administration::Administration (int collocated)
 {
   this->ImplementationRepository_Administration_setup_collocation (collocated);
 }
 
-ImplementationRepository::Administration::~Administration (void)
-{}
-
 void
 ImplementationRepository::Administration::ImplementationRepository_Administration_setup_collocation (int collocated)
 {
@@ -5642,44 +6307,67 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
       ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::the_TAO_Administration_Remote_Proxy_Broker ();
 }
 
-void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
+ImplementationRepository::Administration::~Administration (void)
+{}
+
+void 
+ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Administration *tmp = ACE_static_cast (Administration*, _tao_void_pointer);
+  Administration *tmp = ACE_static_cast (Administration *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow (
+ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return Administration::_nil ();
+    {
+      return Administration::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:ImplementationRepository/Administration:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (Administration::_nil ());
+      
       if (is_a == 0)
-        return Administration::_nil ();
+        {
+          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
   )
 {
   if (CORBA::is_nil (obj))
-    return Administration::_nil ();
+    {
+      return Administration::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      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 () &&
@@ -5697,7 +6385,7 @@ ImplementationRepository::Administration::_unchecked_narrow (
               Administration::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -5710,56 +6398,89 @@ ImplementationRepository::Administration::_unchecked_narrow (
               Administration::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Administration_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Administration::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Administration::_tao_class_id
+                )
+            )
         );
 }
 
 ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+ImplementationRepository::Administration::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:ImplementationRepository/Administration:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->CORBA_Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_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;
 }
 
@@ -5768,6 +6489,9 @@ const char* ImplementationRepository::Administration::_interface_repository_id (
   return "IDL:ImplementationRepository/Administration:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::activate_server (
     const char * server
     ACE_ENV_ARG_DECL
@@ -5778,16 +6502,20 @@ 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 ACE_ENV_ARG_PARAMETER
+      server
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 char * ImplementationRepository::Administration::activate_server_with_startup (
     const char * server,
     CORBA::Long check_startup
@@ -5799,17 +6527,21 @@ 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,
-      check_startup ACE_ENV_ARG_PARAMETER
+      check_startup
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::register_server (
     const char * server,
     const ImplementationRepository::StartupOptions & options
@@ -5820,17 +6552,21 @@ 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,
-      options ACE_ENV_ARG_PARAMETER
+      options
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::reregister_server (
     const char * server,
     const ImplementationRepository::StartupOptions & options
@@ -5840,17 +6576,21 @@ 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,
-      options ACE_ENV_ARG_PARAMETER
+      options
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::remove_server (
     const char * server
     ACE_ENV_ARG_DECL
@@ -5860,16 +6600,20 @@ 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 ACE_ENV_ARG_PARAMETER
+      server
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::shutdown_server (
     const char * server
     ACE_ENV_ARG_DECL
@@ -5879,16 +6623,20 @@ 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 ACE_ENV_ARG_PARAMETER
+      server
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 char * ImplementationRepository::Administration::server_is_running (
     const char * server,
     const char * addr,
@@ -5900,18 +6648,22 @@ 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,
       addr,
-      server_object ACE_ENV_ARG_PARAMETER
+      server_object
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
     ACE_ENV_ARG_DECL
@@ -5921,16 +6673,20 @@ 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 ACE_ENV_ARG_PARAMETER
+      server
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::find (
     const char * server,
     ImplementationRepository::ServerInformation_out info
@@ -5941,17 +6697,21 @@ 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,
-      info ACE_ENV_ARG_PARAMETER
+      info
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Administration::list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
@@ -5962,40 +6722,44 @@ 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,
       server_list,
-      server_iterator ACE_ENV_ARG_PARAMETER
+      server_iterator
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    15,
+  ACE_NTOHL (0x41646d69), 
+  ACE_NTOHL (0x6e697374), 
+  ACE_NTOHL (0x72617469), 
   ACE_NTOHL (0x6f6e0000),  // name = Administration
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
     CORBA::tk_objref,
@@ -6007,12 +6771,15 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Administration,
+    &_tc_TAO_tc_ImplementationRepository_Administration
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0;
 
@@ -6059,13 +6826,23 @@ tao_ImplementationRepository_ServerInformationIterator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_ServerInformationIterator_marshal (
+    ImplementationRepository::ServerInformationIterator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // ImplementationRepository::ServerInformationIterator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void) // default constructor
+ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void)
   : ptr_ (ServerInformationIterator::_nil ())
 {}
 
@@ -6075,12 +6852,12 @@ ImplementationRepository::ServerInformationIterator_var::ptr (void) const
   return this->ptr_;
 }
 
-ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ::ImplementationRepository::ServerInformationIterator_var &p) // copy constructor
+ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ::ImplementationRepository::ServerInformationIterator_var &p)
   : TAO_Base_var (),
     ptr_ (ServerInformationIterator::_duplicate (p.ptr ()))
 {}
 
-ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void) // destructor
+ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -6109,7 +6886,7 @@ ImplementationRepository::ServerInformationIterator_var::operator const ::Implem
   return this->ptr_;
 }
 
-ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
+ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -6184,10 +6961,11 @@ ImplementationRepository::ServerInformationIterator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // ImplementationRepository::ServerInformationIterator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_ptr &p)
@@ -6196,14 +6974,14 @@ ImplementationRepository::ServerInformationIterator_out::ServerInformationIterat
   this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_var &p) // constructor from _var
+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) // copy constructor
+ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (const ::ImplementationRepository::ServerInformationIterator_out &p)
   : ptr_ (ACE_const_cast (ServerInformationIterator_out &, p).ptr_)
 {}
 
@@ -6234,7 +7012,7 @@ ImplementationRepository::ServerInformationIterator_out::operator ::Implementati
 }
 
 ::ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_out::ptr (void) // ptr
+ImplementationRepository::ServerInformationIterator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -6245,43 +7023,53 @@ ImplementationRepository::ServerInformationIterator_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ClientRequestInfo_i
 {
 public:
   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_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::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_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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    how_many_ (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));
+
+    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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      how_many_ (how_many)
 {}
 
 Dynamic::ParameterList *
@@ -6292,16 +7080,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].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6313,11 +7100,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))
 {
@@ -6326,49 +7113,54 @@ 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;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target 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_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-
-
-};
-
-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
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      CORBA::Object_ptr _tao_target
+      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_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
+  
+  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      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
@@ -6379,9 +7171,8 @@ 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;
-
 }
 
 Dynamic::ExceptionList *
@@ -6392,11 +7183,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))
 {
@@ -6405,14 +7196,19 @@ 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;
 }
 
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// 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)
@@ -6423,6 +7219,9 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::_TAO
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::next_n (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
@@ -6433,21 +7232,20 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
     CORBA::SystemException
   ))
 {
-
   CORBA::Boolean _tao_retval = 0;
-
-
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
-
-
+    {
+      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",
@@ -6455,158 +7253,197 @@ 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,
-        _collocated_tao_target_,
-        how_many ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval);
-
+          &_tao_call,
+          _collocated_tao_target_,
+          how_many
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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);
+          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_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_out << how_many)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  _tao_retval
+                );
+            }
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          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
-              );
-
+                  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_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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_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
-              );
-
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info = _tao_retval;
+          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
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval);
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-return _tao_retval;
+      
+      break;
+    }
+  
+  return _tao_retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -6615,15 +7452,13 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
     CORBA::SystemException
   ))
 {
-
-
-
-
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -6631,138 +7466,164 @@ 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,
-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
+          &_tao_call,
+          _collocated_tao_target_
+          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 (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              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;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
+          
           _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)
-              );
-
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
-
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-
-        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;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          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 =
+            _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 =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-    break;
-  }
-
+      
+      break;
+    }
 }
 
-
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -6798,30 +7659,25 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
 ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::ServerInformationIterator *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::ImplementationRepository::ServerInformationIterator *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:198
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated)
 {
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (collocated);
 }
 
-ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
-{}
-
 void
 ImplementationRepository::ServerInformationIterator::ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated)
 {
@@ -6833,44 +7689,67 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
       ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::the_TAO_ServerInformationIterator_Remote_Proxy_Broker ();
 }
 
-void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
+ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
+{}
+
+void 
+ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator*, _tao_void_pointer);
+  ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow (
+ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerInformationIterator::_nil ();
+    {
+      return ServerInformationIterator::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (ServerInformationIterator::_nil ());
+      
       if (is_a == 0)
-        return ServerInformationIterator::_nil ();
+        {
+          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
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerInformationIterator::_nil ();
+    {
+      return ServerInformationIterator::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      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 () &&
@@ -6888,7 +7767,7 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
               ServerInformationIterator::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -6901,56 +7780,89 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
               ServerInformationIterator::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerInformationIterator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerInformationIterator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerInformationIterator::_tao_class_id
+                )
+            )
         );
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+ImplementationRepository::ServerInformationIterator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->CORBA_Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_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;
 }
 
@@ -6959,6 +7871,9 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
@@ -6968,62 +7883,69 @@ 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,
-      server_list ACE_ENV_ARG_PARAMETER
+      server_list
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
-void ImplementationRepository::ServerInformationIterator::destroy (
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
+void ImplementationRepository::ServerInformationIterator::destroy (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     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
+      this
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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),
+    26,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e497465), 
+  ACE_NTOHL (0x7261746f), 
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIterator (
     CORBA::tk_objref,
@@ -7035,111 +7957,69 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIter
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformationIterator, &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerInformationIterator,
+    &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::ServerObject_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerObject,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          ImplementationRepository::ServerObject::_duplicate (_tao_elem),
-          ImplementationRepository::ServerObject::_tao_any_destructor
-        );
-    }
+  ImplementationRepository::ServerObject_ptr _tao_objptr =
+    ImplementationRepository::ServerObject::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::ServerObject_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerObject,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::ServerObject::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::ServerObject>::insert (
+      _tao_any,
+      ImplementationRepository::ServerObject::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerObject,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     ImplementationRepository::ServerObject_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::ServerObject::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerObject
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::ServerObject>::extract (
+        _tao_any,
+        ImplementationRepository::ServerObject::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerObject,
+        _tao_elem
       );
-
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_ServerObject,
-            1,
-            _tao_elem,
-            ImplementationRepository::ServerObject::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::ServerObject::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::ServerObject>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject, ImplementationRepository::ServerObject_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerObject>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7147,16 +8027,12 @@ void operator<<= (
     const ImplementationRepository::AlreadyRegistered &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_AlreadyRegistered,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert_copy (
+      _tao_any,
+      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+      ImplementationRepository::_tc_AlreadyRegistered,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -7165,28 +8041,22 @@ void operator<<= (
     ImplementationRepository::AlreadyRegistered *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_AlreadyRegistered,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::AlreadyRegistered::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert (
+      _tao_any,
+      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+      ImplementationRepository::_tc_AlreadyRegistered,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,ImplementationRepository::AlreadyRegistered *&_tao_elem
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::AlreadyRegistered *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::AlreadyRegistered*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::AlreadyRegistered *&,
       _tao_elem
     );
 }
@@ -7197,86 +8067,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::AlreadyRegistered *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_AlreadyRegistered
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (ImplementationRepository::AlreadyRegistered *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::AlreadyRegistered *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::AlreadyRegistered,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        CORBA::String_var interface_repository_id;
-
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:ImplementationRepository/AlreadyRegistered:1.0")
-              )
-          {
-            return 0;
-          }
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_AlreadyRegistered,
-                1,
-                tmp,
-                ImplementationRepository::AlreadyRegistered::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::extract (
+        _tao_any,
+        ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+        ImplementationRepository::_tc_AlreadyRegistered,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7284,16 +8092,12 @@ void operator<<= (
     const ImplementationRepository::CannotActivate &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_CannotActivate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert_copy (
+      _tao_any,
+      ImplementationRepository::CannotActivate::_tao_any_destructor,
+      ImplementationRepository::_tc_CannotActivate,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -7302,28 +8106,22 @@ void operator<<= (
     ImplementationRepository::CannotActivate *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_CannotActivate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::CannotActivate::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert (
+      _tao_any,
+      ImplementationRepository::CannotActivate::_tao_any_destructor,
+      ImplementationRepository::_tc_CannotActivate,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,ImplementationRepository::CannotActivate *&_tao_elem
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::CannotActivate *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::CannotActivate*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::CannotActivate *&,
       _tao_elem
     );
 }
@@ -7334,86 +8132,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::CannotActivate *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_CannotActivate
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (ImplementationRepository::CannotActivate *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::CannotActivate *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::CannotActivate,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        CORBA::String_var interface_repository_id;
-
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:ImplementationRepository/CannotActivate:1.0")
-              )
-          {
-            return 0;
-          }
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_CannotActivate,
-                1,
-                tmp,
-                ImplementationRepository::CannotActivate::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::extract (
+        _tao_any,
+        ImplementationRepository::CannotActivate::_tao_any_destructor,
+        ImplementationRepository::_tc_CannotActivate,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7421,16 +8157,12 @@ void operator<<= (
     const ImplementationRepository::NotFound &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_NotFound,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert_copy (
+      _tao_any,
+      ImplementationRepository::NotFound::_tao_any_destructor,
+      ImplementationRepository::_tc_NotFound,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -7439,28 +8171,22 @@ void operator<<= (
     ImplementationRepository::NotFound *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_NotFound,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::NotFound::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert (
+      _tao_any,
+      ImplementationRepository::NotFound::_tao_any_destructor,
+      ImplementationRepository::_tc_NotFound,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,ImplementationRepository::NotFound *&_tao_elem
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::NotFound *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::NotFound*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::NotFound *&,
       _tao_elem
     );
 }
@@ -7471,86 +8197,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::NotFound *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_NotFound
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (ImplementationRepository::NotFound *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::NotFound *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::NotFound,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        CORBA::String_var interface_repository_id;
-
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:ImplementationRepository/NotFound:1.0")
-              )
-          {
-            return 0;
-          }
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_NotFound,
-                1,
-                tmp,
-                ImplementationRepository::NotFound::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::extract (
+        _tao_any,
+        ImplementationRepository::NotFound::_tao_any_destructor,
+        ImplementationRepository::_tc_NotFound,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7558,16 +8222,12 @@ void operator<<= (
     const ImplementationRepository::EnvironmentVariable &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentVariable,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert_copy (
+      _tao_any,
+      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentVariable,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -7576,19 +8236,12 @@ void operator<<= (
     ImplementationRepository::EnvironmentVariable *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentVariable,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::EnvironmentVariable::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert (
+      _tao_any,
+      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentVariable,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -7609,76 +8262,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::EnvironmentVariable *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_EnvironmentVariable
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const ImplementationRepository::EnvironmentVariable*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::EnvironmentVariable *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::EnvironmentVariable,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_EnvironmentVariable,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::EnvironmentVariable::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::extract (
+        _tao_any,
+        ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+        ImplementationRepository::_tc_EnvironmentVariable,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7686,16 +8287,12 @@ void operator<<= (
     const ImplementationRepository::EnvironmentList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert_copy (
+      _tao_any,
+      ImplementationRepository::EnvironmentList::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -7704,19 +8301,12 @@ void operator<<= (
     ImplementationRepository::EnvironmentList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::EnvironmentList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert (
+      _tao_any,
+      ImplementationRepository::EnvironmentList::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -7725,8 +8315,8 @@ CORBA::Boolean operator>>= (
     ImplementationRepository::EnvironmentList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::EnvironmentList*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::EnvironmentList *&,
       _tao_elem
     );
 }
@@ -7737,116 +8327,52 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::EnvironmentList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_EnvironmentList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const ImplementationRepository::EnvironmentList*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::EnvironmentList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::EnvironmentList,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_EnvironmentList,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::EnvironmentList::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::extract (
+        _tao_any,
+        ImplementationRepository::EnvironmentList::_tao_any_destructor,
+        ImplementationRepository::_tc_EnvironmentList,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ActivationMode _tao_elem)
+// 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,
+    ImplementationRepository::ActivationMode _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::insert (
+      _tao_any,
       ImplementationRepository::_tc_ActivationMode,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ActivationMode &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::ActivationMode &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
+        _tao_any,
+        ImplementationRepository::_tc_ActivationMode,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7854,16 +8380,12 @@ void operator<<= (
     const ImplementationRepository::StartupOptions &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_StartupOptions,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert_copy (
+      _tao_any,
+      ImplementationRepository::StartupOptions::_tao_any_destructor,
+      ImplementationRepository::_tc_StartupOptions,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -7872,19 +8394,12 @@ void operator<<= (
     ImplementationRepository::StartupOptions *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_StartupOptions,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::StartupOptions::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert (
+      _tao_any,
+      ImplementationRepository::StartupOptions::_tao_any_destructor,
+      ImplementationRepository::_tc_StartupOptions,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -7905,76 +8420,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::StartupOptions *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_StartupOptions
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const ImplementationRepository::StartupOptions*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::StartupOptions *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::StartupOptions,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_StartupOptions,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::StartupOptions::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::extract (
+        _tao_any,
+        ImplementationRepository::StartupOptions::_tao_any_destructor,
+        ImplementationRepository::_tc_StartupOptions,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7982,16 +8445,12 @@ void operator<<= (
     const ImplementationRepository::ServerInformation &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformation,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert_copy (
+      _tao_any,
+      ImplementationRepository::ServerInformation::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformation,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8000,19 +8459,12 @@ void operator<<= (
     ImplementationRepository::ServerInformation *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformation,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::ServerInformation::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformation::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformation,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -8033,76 +8485,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::ServerInformation *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerInformation
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const ImplementationRepository::ServerInformation*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::ServerInformation *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::ServerInformation,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_ServerInformation,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::ServerInformation::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformation::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformation,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8110,16 +8510,12 @@ void operator<<= (
     const ImplementationRepository::ServerInformationList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert_copy (
+      _tao_any,
+      ImplementationRepository::ServerInformationList::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8128,19 +8524,12 @@ void operator<<= (
     ImplementationRepository::ServerInformationList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::ServerInformationList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformationList::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -8149,8 +8538,8 @@ CORBA::Boolean operator>>= (
     ImplementationRepository::ServerInformationList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::ServerInformationList*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::ServerInformationList *&,
       _tao_elem
     );
 }
@@ -8161,271 +8550,126 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::ServerInformationList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerInformationList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const ImplementationRepository::ServerInformationList*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::ServerInformationList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::ServerInformationList,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_ServerInformationList,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::ServerInformationList::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformationList::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformationList,
+        _tao_elem
+      );
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::Administration_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_Administration,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          ImplementationRepository::Administration::_duplicate (_tao_elem),
-          ImplementationRepository::Administration::_tao_any_destructor
-        );
-    }
+  ImplementationRepository::Administration_ptr _tao_objptr =
+    ImplementationRepository::Administration::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::Administration_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_Administration,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::Administration::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::Administration>::insert (
+      _tao_any,
+      ImplementationRepository::Administration::_tao_any_destructor,
+      ImplementationRepository::_tc_Administration,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     ImplementationRepository::Administration_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::Administration::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_Administration
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::Administration>::extract (
+        _tao_any,
+        ImplementationRepository::Administration::_tao_any_destructor,
+        ImplementationRepository::_tc_Administration,
+        _tao_elem
       );
-
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_Administration,
-            1,
-            _tao_elem,
-            ImplementationRepository::Administration::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::Administration::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::Administration>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration, ImplementationRepository::Administration_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Administration>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::ServerInformationIterator_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationIterator,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem),
-          ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-        );
-    }
+  ImplementationRepository::ServerInformationIterator_ptr _tao_objptr =
+    ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::ServerInformationIterator_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationIterator,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationIterator,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     ImplementationRepository::ServerInformationIterator_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerInformationIterator
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformationIterator,
+        _tao_elem
       );
-
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_ServerInformationIterator,
-            1,
-            _tao_elem,
-            ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator, ImplementationRepository::ServerInformationIterator_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>
 #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
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::ServerObject_ptr _tao_objref
@@ -8443,9 +8687,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::ServerObject::_unchecked_narrow (
           obj.in ()
@@ -8462,22 +8710,30 @@ CORBA::Boolean operator>> (
   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 ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // 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 _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -8486,45 +8742,64 @@ CORBA::Boolean operator>> (
   )
 {
   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 1159.)
-    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_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // 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]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  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 ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // 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 _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -8533,29 +8808,43 @@ CORBA::Boolean operator>> (
   )
 {
   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 1159.)
-    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_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // 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]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::Administration_ptr _tao_objref
@@ -8573,9 +8862,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::Administration::_unchecked_narrow (
           obj.in ()
@@ -8592,6 +8885,9 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
@@ -8609,9 +8905,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
           obj.in ()
@@ -8627,3 +8927,4 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 9554be86027..c8133032228 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IMPLREPOC_H_
-#define _TAO_IDL_IMPLREPOC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
+#define _TAO_IDL_ORIG_IMPLREPOC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -59,21 +62,29 @@
 #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_module/module_ch.cpp:48
+
 TAO_NAMESPACE  ImplementationRepository
 {
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_
   
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-  
+
 #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
   {
   public:
@@ -113,13 +124,14 @@ TAO_NAMESPACE  ImplementationRepository
     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
   {
   public:
@@ -136,35 +148,26 @@ TAO_NAMESPACE  ImplementationRepository
   private:
     ServerObject_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // ImplementationRepository::ServerObject
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
   
-  // Forward Classes Declaration.
   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
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerObject_ptr _ptr_type;
     typedef ServerObject_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -185,41 +188,48 @@ TAO_NAMESPACE  ImplementationRepository
         return (ServerObject_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    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
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        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
+    // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
     
     ServerObject (
@@ -227,12 +237,11 @@ TAO_NAMESPACE  ImplementationRepository
         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;
-    
-    virtual ~ServerObject (void);
   
   private:
     ServerObject (const ServerObject &);
@@ -240,19 +249,26 @@ TAO_NAMESPACE  ImplementationRepository
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // 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) { }
+    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
@@ -261,6 +277,9 @@ TAO_NAMESPACE  ImplementationRepository
         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
@@ -268,8 +287,7 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_ServerObject_Proxy_Impl (void);
   };
@@ -283,6 +301,9 @@ TAO_NAMESPACE  ImplementationRepository
   //                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
@@ -290,7 +311,11 @@ TAO_NAMESPACE  ImplementationRepository
   public:
     _TAO_ServerObject_Remote_Proxy_Impl (void);
     
-    virtual ~_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
@@ -299,6 +324,9 @@ TAO_NAMESPACE  ImplementationRepository
         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
@@ -306,8 +334,6 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -319,12 +345,14 @@ TAO_NAMESPACE  ImplementationRepository
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
+  // 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:
     virtual ~_TAO_ServerObject_Proxy_Broker (void);
@@ -347,6 +375,9 @@ TAO_NAMESPACE  ImplementationRepository
   //                 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
   {
@@ -373,13 +404,17 @@ TAO_NAMESPACE  ImplementationRepository
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
+  // 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_
   
@@ -392,9 +427,9 @@ TAO_NAMESPACE  ImplementationRepository
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static AlreadyRegistered *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -412,32 +447,38 @@ TAO_NAMESPACE  ImplementationRepository
         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_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
   
+  // 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;
     
+    TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static CannotActivate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -455,19 +496,29 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
-        CannotActivate (
+    // 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_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
   
+  // 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_
   
@@ -480,9 +531,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -500,32 +551,36 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
         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_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   
+  // 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 */
   
-  struct EnvironmentVariable;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class EnvironmentVariable_var;
   
   struct TAO_PortableServer_Export EnvironmentVariable
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EnvironmentVariable_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    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:
@@ -542,6 +597,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     operator const EnvironmentVariable &() const;
     operator EnvironmentVariable &();
     operator EnvironmentVariable &() const;
+    
     // Variable-size types only.
     operator EnvironmentVariable *&();
     
@@ -556,6 +612,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     EnvironmentVariable *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_PortableServer_Export EnvironmentVariable_out
   {
   public:
@@ -574,24 +633,35 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     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
+  
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  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_EXPORT_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
+  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
@@ -628,55 +698,61 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #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
+  
   class EnvironmentList;
   class EnvironmentList_var;
   
   // *************************************************************
-  // EnvironmentList
+  // 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 */ 
   {
   public:
-    EnvironmentList (void); // default ctor
-    EnvironmentList (CORBA::ULong max); // uses max size
+    EnvironmentList (void);
+    EnvironmentList (CORBA::ULong max);
     EnvironmentList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         EnvironmentVariable *buffer, 
         CORBA::Boolean release = 0
       );
-    EnvironmentList (const EnvironmentList &); // copy ctor
+    EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EnvironmentList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #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
   // *************************************************************
@@ -697,7 +773,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     operator const EnvironmentList &() const;
     operator EnvironmentList &();
     operator EnvironmentList &() const;
-    operator EnvironmentList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator EnvironmentList *&();
     
     EnvironmentVariable & operator[] (CORBA::ULong index);
     const EnvironmentVariable & operator[] (CORBA::ULong index) const;
@@ -712,14 +790,15 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   private:
     EnvironmentList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #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:
@@ -738,12 +817,17 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     // Assignment from T_var not allowed.
     void operator= (const EnvironmentList_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_EnvironmentList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ActivationMode
   {
     NORMAL,
@@ -753,28 +837,32 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   };
   
   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;
   
-  struct StartupOptions;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class StartupOptions_var;
   
   struct TAO_PortableServer_Export StartupOptions
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef StartupOptions_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
-    ACE_NESTED_CLASS (ImplementationRepository, EnvironmentList) environment;
+    ImplementationRepository::EnvironmentList environment;
     TAO_String_Manager working_directory;
-    ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation;
+    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:
@@ -791,6 +879,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     operator const StartupOptions &() const;
     operator StartupOptions &();
     operator StartupOptions &() const;
+    
     // Variable-size types only.
     operator StartupOptions *&();
     
@@ -805,6 +894,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     StartupOptions *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_PortableServer_Export StartupOptions_out
   {
   public:
@@ -823,27 +915,30 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     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;
   
-  struct ServerInformation;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ServerInformation_var;
   
   struct TAO_PortableServer_Export ServerInformation
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerInformation_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
-    ACE_NESTED_CLASS (ImplementationRepository, StartupOptions) startup;
+    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:
@@ -860,6 +955,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     operator const ServerInformation &() const;
     operator ServerInformation &();
     operator ServerInformation &() const;
+    
     // Variable-size types only.
     operator ServerInformation *&();
     
@@ -874,6 +970,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     ServerInformation *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_PortableServer_Export ServerInformation_out
   {
   public:
@@ -892,19 +991,23 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     void operator= (const ServerInformation_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
+  // 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_EXPORT_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
+  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
@@ -941,55 +1044,61 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #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
+  
   class ServerInformationList;
   class ServerInformationList_var;
   
   // *************************************************************
-  // ServerInformationList
+  // 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 */ 
   {
   public:
-    ServerInformationList (void); // default ctor
-    ServerInformationList (CORBA::ULong max); // uses max size
+    ServerInformationList (void);
+    ServerInformationList (CORBA::ULong max);
     ServerInformationList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         ServerInformation *buffer, 
         CORBA::Boolean release = 0
       );
-    ServerInformationList (const ServerInformationList &); // copy ctor
+    ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerInformationList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #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
   // *************************************************************
@@ -1010,7 +1119,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     operator const ServerInformationList &() const;
     operator ServerInformationList &();
     operator ServerInformationList &() const;
-    operator ServerInformationList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator ServerInformationList *&();
     
     ServerInformation & operator[] (CORBA::ULong index);
     const ServerInformation & operator[] (CORBA::ULong index) const;
@@ -1025,14 +1136,15 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   private:
     ServerInformationList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #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:
@@ -1051,25 +1163,32 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     // Assignment from T_var not allowed.
     void operator= (const ServerInformationList_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_ServerInformationList;
   
-  class ServerInformationIterator;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
   
+  class ServerInformationIterator;
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
   
   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:
@@ -1109,13 +1228,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     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
   {
   public:
@@ -1132,23 +1252,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   private:
     ServerInformationIterator_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 (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_
   
   class Administration;
   typedef Administration *Administration_ptr;
-  
+
 #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
   {
   public:
@@ -1188,13 +1311,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     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
   {
   public:
@@ -1211,35 +1335,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   private:
     Administration_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // ImplementationRepository::Administration
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
   
-  // Forward Classes Declaration.
   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
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1260,7 +1375,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         return (Administration_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    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
@@ -1272,6 +1390,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_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
@@ -1283,6 +1404,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_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
@@ -1293,6 +1417,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1302,6 +1429,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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
@@ -1311,6 +1441,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1320,6 +1453,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1331,6 +1467,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1340,6 +1479,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1350,6 +1492,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1360,23 +1505,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        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
+    // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
     
     Administration (
@@ -1384,12 +1532,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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;
-    
-    virtual ~Administration (void);
   
   private:
     Administration (const Administration &);
@@ -1397,19 +1544,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // 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) { }
+    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
@@ -1421,6 +1575,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_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,
@@ -1433,6 +1590,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_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,
@@ -1444,6 +1604,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1454,6 +1617,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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
@@ -1464,6 +1630,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1474,6 +1643,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1486,6 +1658,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1496,6 +1671,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1507,6 +1685,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1517,8 +1698,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_Administration_Proxy_Impl (void);
   };
@@ -1532,6 +1712,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   //                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
@@ -1539,7 +1722,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   public:
     _TAO_Administration_Remote_Proxy_Impl (void);
     
-    virtual ~_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
@@ -1551,6 +1738,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_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,
@@ -1563,6 +1753,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_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,
@@ -1574,6 +1767,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1584,6 +1780,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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
@@ -1594,6 +1793,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1604,6 +1806,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1616,6 +1821,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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
@@ -1626,6 +1834,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1637,6 +1848,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         , 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,
@@ -1647,8 +1861,6 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -1660,12 +1872,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
+  // 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:
     virtual ~_TAO_Administration_Proxy_Broker (void);
@@ -1688,6 +1902,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   //                 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
   {
@@ -1714,25 +1931,31 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
+  // 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:
@@ -1772,13 +1995,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
     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
   {
   public:
@@ -1795,35 +2019,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   private:
     ServerInformationIterator_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // ImplementationRepository::ServerInformationIterator
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
   
-  // Forward Classes Declaration.
   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
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1844,7 +2059,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         return (ServerInformationIterator_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    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,
@@ -1855,31 +2073,36 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        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
+    // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
     
     ServerInformationIterator (
@@ -1887,12 +2110,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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;
-    
-    virtual ~ServerInformationIterator (void);
   
   private:
     ServerInformationIterator (const ServerInformationIterator &);
@@ -1900,19 +2122,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // 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) { }
+    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,
@@ -1923,6 +2152,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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
@@ -1930,8 +2162,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_ServerInformationIterator_Proxy_Impl (void);
   };
@@ -1945,6 +2176,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   //                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
@@ -1952,7 +2186,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   public:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
     
-    virtual ~_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,
@@ -1963,6 +2201,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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
@@ -1970,8 +2211,6 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -1983,12 +2222,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
+  // 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:
     virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
@@ -2011,6 +2252,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   //                 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
   {
@@ -2037,18 +2281,25 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
-  
+  // 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
+
 extern TAO_PortableServer_Export
 ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
@@ -2067,69 +2318,135 @@ ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-// Any operators for interface ImplementationRepository::ServerObject
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
+
+// 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 ImplementationRepository::EnvironmentList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
+
+// 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 ImplementationRepository::ServerInformationList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
-// Any operators for interface ImplementationRepository::Administration
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
-// Any operators for interface ImplementationRepository::ServerInformationIterator
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
 
+// 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_interface/cdr_op_ch.cpp:55
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 
@@ -2144,13 +2461,27 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 
@@ -2165,13 +2496,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
+// 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.i"
@@ -2187,3 +2530,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index c9558847f13..6de33c4d4a2 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -20,6 +20,9 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
 
@@ -34,27 +37,24 @@ ImplementationRepository::ServerObject::ServerObject (
   this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception ImplementationRepository::AlreadyRegistered
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception ImplementationRepository::CannotActivate
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception ImplementationRepository::NotFound
-// *************************************************************
+// 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) // default constructor
+ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (void)
   : ptr_ (0)
 {}
 
@@ -64,42 +64,52 @@ ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (Envi
 {}
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (const ::ImplementationRepository::EnvironmentVariable_var &p) // copy constructor
+ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (const ::ImplementationRepository::EnvironmentVariable_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::ImplementationRepository::EnvironmentVariable (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::ImplementationRepository::EnvironmentVariable (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::~EnvironmentVariable_var (void) // destructor
+ImplementationRepository::EnvironmentVariable_var::~EnvironmentVariable_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::EnvironmentVariable_var &
-ImplementationRepository::EnvironmentVariable_var::operator= (EnvironmentVariable *p)
+ACE_INLINE
+ImplementationRepository::EnvironmentVariable_var &
+ImplementationRepository::EnvironmentVariable_var::operator= (EnvironmentVariable *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable_var &
-ImplementationRepository::EnvironmentVariable_var::operator= (const ::ImplementationRepository::EnvironmentVariable_var &p)
+ACE_INLINE
+::ImplementationRepository::EnvironmentVariable_var &
+ImplementationRepository::EnvironmentVariable_var::operator= (const ::ImplementationRepository::EnvironmentVariable_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          EnvironmentVariable *deep_copy =
-            new EnvironmentVariable (*p.ptr_);
+          EnvironmentVariable *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              EnvironmentVariable (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -144,7 +154,7 @@ ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepo
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
 {
@@ -163,7 +173,7 @@ ImplementationRepository::EnvironmentVariable_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
 ImplementationRepository::EnvironmentVariable_var::out (void)
 {
@@ -186,6 +196,9 @@ 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
 // *************************************************************
@@ -198,7 +211,7 @@ ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (::Im
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (EnvironmentVariable_var &p) // constructor from _var
+ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (EnvironmentVariable_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -206,21 +219,23 @@ ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (Envi
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (const ::ImplementationRepository::EnvironmentVariable_out &p) // copy constructor
+ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (const ::ImplementationRepository::EnvironmentVariable_out &p)
   : ptr_ (ACE_const_cast (EnvironmentVariable_out&, p).ptr_)
 {}
 
-ACE_INLINE ImplementationRepository::EnvironmentVariable_out &
+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 *p)
+ACE_INLINE
+ImplementationRepository::EnvironmentVariable_out &
+ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariable *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -242,192 +257,231 @@ 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_
 
-// = Static operations.
-ACE_INLINE ImplementationRepository::EnvironmentVariable *
+ACE_INLINE
+ImplementationRepository::EnvironmentVariable *
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   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)
-// Free the sequence.
+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) // Default constructor.
+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) // Constructor using a maximum length value.
+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)
+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)
-// Copy constructor.
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
-// Assignment operator.
+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;
+    {
+      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_);
+      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_);
+    {
+      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_);
+  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];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE ImplementationRepository::EnvironmentVariable &
+ACE_INLINE
+ImplementationRepository::EnvironmentVariable &
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
+  ImplementationRepository::EnvironmentVariable* tmp =
+    ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const ImplementationRepository::EnvironmentVariable &
+ACE_INLINE
+const ImplementationRepository::EnvironmentVariable &
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
+  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 *
+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_);
+      // 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;
+      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 *
+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_);
+  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)
+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);
-  }
+    {
+      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) // default constructor
+ImplementationRepository::EnvironmentList_var::EnvironmentList_var (void)
   : ptr_ (0)
 {}
 
@@ -437,21 +491,26 @@ ImplementationRepository::EnvironmentList_var::EnvironmentList_var (EnvironmentL
 {}
 
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::EnvironmentList_var (const ::ImplementationRepository::EnvironmentList_var &p) // copy constructor
+ImplementationRepository::EnvironmentList_var::EnvironmentList_var (const ::ImplementationRepository::EnvironmentList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::ImplementationRepository::EnvironmentList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::ImplementationRepository::EnvironmentList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::~EnvironmentList_var (void) // destructor
+ImplementationRepository::EnvironmentList_var::~EnvironmentList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::EnvironmentList_var &
+ACE_INLINE
+ImplementationRepository::EnvironmentList_var &
 ImplementationRepository::EnvironmentList_var::operator= (EnvironmentList *p)
 {
   delete this->ptr_;
@@ -459,7 +518,8 @@ ImplementationRepository::EnvironmentList_var::operator= (EnvironmentList *p)
   return *this;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList_var &
+ACE_INLINE
+::ImplementationRepository::EnvironmentList_var &
 ImplementationRepository::EnvironmentList_var::operator= (const ::ImplementationRepository::EnvironmentList_var &p)
 {
   if (this != &p)
@@ -471,8 +531,12 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
         }
       else
         {
-          EnvironmentList *deep_copy =
-            new EnvironmentList (*p.ptr_);
+          EnvironmentList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              EnvironmentList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -487,69 +551,75 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
   return *this;
 }
 
-ACE_INLINE const ::ImplementationRepository::EnvironmentList *
+ACE_INLINE
+const ::ImplementationRepository::EnvironmentList *
 ImplementationRepository::EnvironmentList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList *
+ACE_INLINE
+::ImplementationRepository::EnvironmentList *
 ImplementationRepository::EnvironmentList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::EnvironmentVariable &
+ACE_INLINE
+ImplementationRepository::EnvironmentVariable &
 ImplementationRepository::EnvironmentList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ImplementationRepository::EnvironmentVariable &
+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 &
+ACE_INLINE
+const ::ImplementationRepository::EnvironmentList &
 ImplementationRepository::EnvironmentList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList &
+ACE_INLINE
+::ImplementationRepository::EnvironmentList &
 ImplementationRepository::EnvironmentList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::ImplementationRepository::EnvironmentList *&
+ACE_INLINE
+::ImplementationRepository::EnvironmentList *&
 ImplementationRepository::EnvironmentList_var::out (void)
 {
   delete this->ptr_;
@@ -557,7 +627,8 @@ ImplementationRepository::EnvironmentList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList *
+ACE_INLINE
+::ImplementationRepository::EnvironmentList *
 ImplementationRepository::EnvironmentList_var::_retn (void)
 {
   ::ImplementationRepository::EnvironmentList *tmp = this->ptr_;
@@ -565,12 +636,16 @@ ImplementationRepository::EnvironmentList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList *
+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
 // *************************************************************
@@ -583,7 +658,7 @@ ImplementationRepository::EnvironmentList_out::EnvironmentList_out (EnvironmentL
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentList_out::EnvironmentList_out (EnvironmentList_var &p) // constructor from _var
+ImplementationRepository::EnvironmentList_out::EnvironmentList_out (EnvironmentList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -591,57 +666,64 @@ ImplementationRepository::EnvironmentList_out::EnvironmentList_out (EnvironmentL
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentList_out::EnvironmentList_out (const ::ImplementationRepository::EnvironmentList_out &p) // copy constructor
+ImplementationRepository::EnvironmentList_out::EnvironmentList_out (const ::ImplementationRepository::EnvironmentList_out &p)
   : ptr_ (ACE_const_cast (EnvironmentList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList_out &
+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 &
+ACE_INLINE
+::ImplementationRepository::EnvironmentList_out &
 ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList *&
+ACE_INLINE
+::ImplementationRepository::EnvironmentList *&
 ImplementationRepository::EnvironmentList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::EnvironmentList *
+ACE_INLINE
+::ImplementationRepository::EnvironmentList *
 ImplementationRepository::EnvironmentList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::EnvironmentVariable &
+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) // default constructor
+ImplementationRepository::StartupOptions_var::StartupOptions_var (void)
   : ptr_ (0)
 {}
 
@@ -651,42 +733,52 @@ ImplementationRepository::StartupOptions_var::StartupOptions_var (StartupOptions
 {}
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::StartupOptions_var (const ::ImplementationRepository::StartupOptions_var &p) // copy constructor
+ImplementationRepository::StartupOptions_var::StartupOptions_var (const ::ImplementationRepository::StartupOptions_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::ImplementationRepository::StartupOptions (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::ImplementationRepository::StartupOptions (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::~StartupOptions_var (void) // destructor
+ImplementationRepository::StartupOptions_var::~StartupOptions_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::StartupOptions_var &
-ImplementationRepository::StartupOptions_var::operator= (StartupOptions *p)
+ACE_INLINE
+ImplementationRepository::StartupOptions_var &
+ImplementationRepository::StartupOptions_var::operator= (StartupOptions *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::ImplementationRepository::StartupOptions_var &
-ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationRepository::StartupOptions_var &p)
+ACE_INLINE
+::ImplementationRepository::StartupOptions_var &
+ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationRepository::StartupOptions_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          StartupOptions *deep_copy =
-            new StartupOptions (*p.ptr_);
+          StartupOptions *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              StartupOptions (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -731,7 +823,7 @@ ImplementationRepository::StartupOptions_var::operator ::ImplementationRepositor
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
 {
@@ -750,7 +842,7 @@ ImplementationRepository::StartupOptions_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::ImplementationRepository::StartupOptions *&
 ImplementationRepository::StartupOptions_var::out (void)
 {
@@ -773,6 +865,9 @@ 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
 // *************************************************************
@@ -785,7 +880,7 @@ ImplementationRepository::StartupOptions_out::StartupOptions_out (::Implementati
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_out::StartupOptions_out (StartupOptions_var &p) // constructor from _var
+ImplementationRepository::StartupOptions_out::StartupOptions_out (StartupOptions_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -793,21 +888,23 @@ ImplementationRepository::StartupOptions_out::StartupOptions_out (StartupOptions
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_out::StartupOptions_out (const ::ImplementationRepository::StartupOptions_out &p) // copy constructor
+ImplementationRepository::StartupOptions_out::StartupOptions_out (const ::ImplementationRepository::StartupOptions_out &p)
   : ptr_ (ACE_const_cast (StartupOptions_out&, p).ptr_)
 {}
 
-ACE_INLINE ImplementationRepository::StartupOptions_out &
+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 *p)
+ACE_INLINE
+ImplementationRepository::StartupOptions_out &
+ImplementationRepository::StartupOptions_out::operator= (StartupOptions *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -829,12 +926,15 @@ 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) // default constructor
+ImplementationRepository::ServerInformation_var::ServerInformation_var (void)
   : ptr_ (0)
 {}
 
@@ -844,42 +944,52 @@ ImplementationRepository::ServerInformation_var::ServerInformation_var (ServerIn
 {}
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::ServerInformation_var (const ::ImplementationRepository::ServerInformation_var &p) // copy constructor
+ImplementationRepository::ServerInformation_var::ServerInformation_var (const ::ImplementationRepository::ServerInformation_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::ImplementationRepository::ServerInformation (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::ImplementationRepository::ServerInformation (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::~ServerInformation_var (void) // destructor
+ImplementationRepository::ServerInformation_var::~ServerInformation_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::ServerInformation_var &
-ImplementationRepository::ServerInformation_var::operator= (ServerInformation *p)
+ACE_INLINE
+ImplementationRepository::ServerInformation_var &
+ImplementationRepository::ServerInformation_var::operator= (ServerInformation *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformation_var &
-ImplementationRepository::ServerInformation_var::operator= (const ::ImplementationRepository::ServerInformation_var &p)
+ACE_INLINE
+::ImplementationRepository::ServerInformation_var &
+ImplementationRepository::ServerInformation_var::operator= (const ::ImplementationRepository::ServerInformation_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          ServerInformation *deep_copy =
-            new ServerInformation (*p.ptr_);
+          ServerInformation *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServerInformation (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -924,7 +1034,7 @@ ImplementationRepository::ServerInformation_var::operator ::ImplementationReposi
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
 {
@@ -943,7 +1053,7 @@ ImplementationRepository::ServerInformation_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::ImplementationRepository::ServerInformation *&
 ImplementationRepository::ServerInformation_var::out (void)
 {
@@ -966,6 +1076,9 @@ 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
 // *************************************************************
@@ -978,7 +1091,7 @@ ImplementationRepository::ServerInformation_out::ServerInformation_out (::Implem
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_out::ServerInformation_out (ServerInformation_var &p) // constructor from _var
+ImplementationRepository::ServerInformation_out::ServerInformation_out (ServerInformation_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -986,21 +1099,23 @@ ImplementationRepository::ServerInformation_out::ServerInformation_out (ServerIn
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_out::ServerInformation_out (const ::ImplementationRepository::ServerInformation_out &p) // copy constructor
+ImplementationRepository::ServerInformation_out::ServerInformation_out (const ::ImplementationRepository::ServerInformation_out &p)
   : ptr_ (ACE_const_cast (ServerInformation_out&, p).ptr_)
 {}
 
-ACE_INLINE ImplementationRepository::ServerInformation_out &
+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 *p)
+ACE_INLINE
+ImplementationRepository::ServerInformation_out &
+ImplementationRepository::ServerInformation_out::operator= (ServerInformation *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -1022,192 +1137,231 @@ 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_
 
-// = Static operations.
-ACE_INLINE ImplementationRepository::ServerInformation *
+ACE_INLINE
+ImplementationRepository::ServerInformation *
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   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)
-// Free the sequence.
+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) // Default constructor.
+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) // Constructor using a maximum length value.
+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)
+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)
-// Copy constructor.
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
-// Assignment operator.
+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;
+    {
+      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_);
+      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_);
+    {
+      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_);
+  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];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE ImplementationRepository::ServerInformation &
+ACE_INLINE
+ImplementationRepository::ServerInformation &
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
+  ImplementationRepository::ServerInformation* tmp =
+    ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const ImplementationRepository::ServerInformation &
+ACE_INLINE
+const ImplementationRepository::ServerInformation &
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
+  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 *
+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_);
+      // 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;
+      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 *
+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_);
+  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)
+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);
-  }
+    {
+      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) // default constructor
+ImplementationRepository::ServerInformationList_var::ServerInformationList_var (void)
   : ptr_ (0)
 {}
 
@@ -1217,21 +1371,26 @@ ImplementationRepository::ServerInformationList_var::ServerInformationList_var (
 {}
 
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::ServerInformationList_var (const ::ImplementationRepository::ServerInformationList_var &p) // copy constructor
+ImplementationRepository::ServerInformationList_var::ServerInformationList_var (const ::ImplementationRepository::ServerInformationList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::ImplementationRepository::ServerInformationList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::ImplementationRepository::ServerInformationList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::~ServerInformationList_var (void) // destructor
+ImplementationRepository::ServerInformationList_var::~ServerInformationList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::ServerInformationList_var &
+ACE_INLINE
+ImplementationRepository::ServerInformationList_var &
 ImplementationRepository::ServerInformationList_var::operator= (ServerInformationList *p)
 {
   delete this->ptr_;
@@ -1239,7 +1398,8 @@ ImplementationRepository::ServerInformationList_var::operator= (ServerInformatio
   return *this;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList_var &
+ACE_INLINE
+::ImplementationRepository::ServerInformationList_var &
 ImplementationRepository::ServerInformationList_var::operator= (const ::ImplementationRepository::ServerInformationList_var &p)
 {
   if (this != &p)
@@ -1251,8 +1411,12 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
         }
       else
         {
-          ServerInformationList *deep_copy =
-            new ServerInformationList (*p.ptr_);
+          ServerInformationList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServerInformationList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1267,69 +1431,75 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
   return *this;
 }
 
-ACE_INLINE const ::ImplementationRepository::ServerInformationList *
+ACE_INLINE
+const ::ImplementationRepository::ServerInformationList *
 ImplementationRepository::ServerInformationList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList *
+ACE_INLINE
+::ImplementationRepository::ServerInformationList *
 ImplementationRepository::ServerInformationList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::ServerInformation &
+ACE_INLINE
+ImplementationRepository::ServerInformation &
 ImplementationRepository::ServerInformationList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ImplementationRepository::ServerInformation &
+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 &
+ACE_INLINE
+const ::ImplementationRepository::ServerInformationList &
 ImplementationRepository::ServerInformationList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList &
+ACE_INLINE
+::ImplementationRepository::ServerInformationList &
 ImplementationRepository::ServerInformationList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::ImplementationRepository::ServerInformationList *&
+ACE_INLINE
+::ImplementationRepository::ServerInformationList *&
 ImplementationRepository::ServerInformationList_var::out (void)
 {
   delete this->ptr_;
@@ -1337,7 +1507,8 @@ ImplementationRepository::ServerInformationList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList *
+ACE_INLINE
+::ImplementationRepository::ServerInformationList *
 ImplementationRepository::ServerInformationList_var::_retn (void)
 {
   ::ImplementationRepository::ServerInformationList *tmp = this->ptr_;
@@ -1345,12 +1516,16 @@ ImplementationRepository::ServerInformationList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList *
+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
 // *************************************************************
@@ -1363,7 +1538,7 @@ ImplementationRepository::ServerInformationList_out::ServerInformationList_out (
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformationList_out::ServerInformationList_out (ServerInformationList_var &p) // constructor from _var
+ImplementationRepository::ServerInformationList_out::ServerInformationList_out (ServerInformationList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1371,51 +1546,57 @@ ImplementationRepository::ServerInformationList_out::ServerInformationList_out (
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformationList_out::ServerInformationList_out (const ::ImplementationRepository::ServerInformationList_out &p) // copy constructor
+ImplementationRepository::ServerInformationList_out::ServerInformationList_out (const ::ImplementationRepository::ServerInformationList_out &p)
   : ptr_ (ACE_const_cast (ServerInformationList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList_out &
+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 &
+ACE_INLINE
+::ImplementationRepository::ServerInformationList_out &
 ImplementationRepository::ServerInformationList_out::operator= (ServerInformationList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList *&
+ACE_INLINE
+::ImplementationRepository::ServerInformationList *&
 ImplementationRepository::ServerInformationList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::ImplementationRepository::ServerInformationList *
+ACE_INLINE
+::ImplementationRepository::ServerInformationList *
 ImplementationRepository::ServerInformationList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ImplementationRepository::ServerInformation &
+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_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
@@ -1431,9 +1612,17 @@ ImplementationRepository::Administration::Administration (
   this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #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_SERVERINFORMATIONITERATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
@@ -1449,9 +1638,18 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerObject_ptr
@@ -1462,86 +1660,156 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
     ImplementationRepository::ServerObject_ptr &
   );
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::AlreadyRegistered &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::AlreadyRegistered &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::AlreadyRegistered&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    ImplementationRepository::AlreadyRegistered&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::CannotActivate &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::CannotActivate &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.reason.in ())
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.reason.in ())
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,ImplementationRepository::CannotActivate &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::CannotActivate &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.reason.out ())
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::NotFound &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::NotFound &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::NotFound&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    ImplementationRepository::NotFound&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::EnvironmentVariable &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::EnvironmentVariable &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.value.in ())
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::EnvironmentVariable &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
     (strm >> _tao_aggregate.value.out ())
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
@@ -1550,6 +1818,7 @@ CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
+
 CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::EnvironmentList &
@@ -1557,13 +1826,18 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ActivationMode &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ActivationMode &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ActivationMode &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ActivationMode &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
@@ -1576,7 +1850,14 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::StartupOptions &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::StartupOptions &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.command_line.in ()) &&
@@ -1584,14 +1865,21 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     (strm << _tao_aggregate.working_directory.in ()) &&
     (strm << _tao_aggregate.activation) &&
     (strm << _tao_aggregate.location.in ())
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::StartupOptions &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.command_line.out ()) &&
@@ -1599,41 +1887,63 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     (strm >> _tao_aggregate.working_directory.out ()) &&
     (strm >> _tao_aggregate.activation) &&
     (strm >> _tao_aggregate.location.out ())
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::ServerInformation &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.logical_server.in ()) &&
     (strm << _tao_aggregate.server.in ()) &&
     (strm << _tao_aggregate.startup) &&
     (strm << _tao_aggregate.location.in ())
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::ServerInformation &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.logical_server.out ()) &&
     (strm >> _tao_aggregate.server.out ()) &&
     (strm >> _tao_aggregate.startup) &&
     (strm >> _tao_aggregate.location.out ())
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
@@ -1642,6 +1952,7 @@ CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
+
 CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationList &
@@ -1649,6 +1960,9 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationIterator_ptr
@@ -1659,6 +1973,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
     ImplementationRepository::ServerInformationIterator_ptr &
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::Administration_ptr
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 6998e7db0b8..9eb1c397bbc 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -19,11 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IMPLREPOS_CPP_
-#define _TAO_IDL_IMPLREPOS_CPP_
 
-#include "ImplRepoS.h"
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
+#define _TAO_IDL_ORIG_IMPLREPOS_CPP_
+
 
+#include "ImplRepoS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -31,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -40,6 +43,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -48,6 +52,11 @@
 #include "ImplRepoS.i"
 #endif /* !defined INLINE */
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+
 class TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -55,55 +64,55 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 8:56:49 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/doctmp/pgontla/ImR/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14,  0, 14,  0, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14,  0, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14,  0,  0, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
+     16, 16, 16,  5, 16,  0, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
+     16,  0, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16,  0,  0, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16,
 #else
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14,  0, 14,  0, 14, 14,
-     14,  0, 14,  0, 14, 14, 14, 14, 14, 14,
-      0, 14,  0, 14, 14,  0,  0, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16,  0, 16,  0, 16, 16,
+     16,  5, 16,  0, 16, 16, 16, 16, 16, 16,
+      0, 16,  0, 16, 16,  0,  0, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -114,14 +123,14 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
 {
   enum
     {
-      TOTAL_KEYWORDS = 5,
+      TOTAL_KEYWORDS = 6,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 13,
-      HASH_VALUE_RANGE = 10,
+      MAX_HASH_VALUE = 15,
+      HASH_VALUE_RANGE = 12,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 9
+      WORDLIST_SIZE = 10
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
@@ -132,9 +141,11 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
       {"",0},{"",0},
       {"shutdown", 	&POA_ImplementationRepository::ServerObject::shutdown_skel},
       {"",0},
-      {"_interface",  &POA_ImplementationRepository::ServerObject::_interface_skel},
+      {"_component",  &POA_ImplementationRepository::ServerObject::_component_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_ImplementationRepository::ServerObject::_non_existent_skel},
+      {"",0},
+      {"_interface",  &POA_ImplementationRepository::ServerObject::_interface_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -151,89 +162,111 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
     }
   return 0;
 }
-/* ending time is 8:56:49 */
 static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::ServerObject *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &
+    );
+  
 private:
   POA_ImplementationRepository::ServerObject *_tao_impl;
-
+  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_ImplementationRepository::ServerObject *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_ImplementationRepository::ServerObject *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -241,13 +274,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -257,91 +291,111 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_de
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::ServerObject *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &
+    );
+  
 private:
   POA_ImplementationRepository::ServerObject *_tao_impl;
-
+  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_ImplementationRepository::ServerObject *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_ImplementationRepository::ServerObject *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -349,13 +403,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -365,7 +420,8 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_mos
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
@@ -377,6 +433,9 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker (void)
 {
@@ -387,8 +446,9 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *POA_Im
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::_TAO_ServerObject_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void)
@@ -396,12 +456,11 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     {
       delete this->proxy_cache_[i];
-
+      
       // Hack to prevent bug mentioned in 1204. Refer to 1204
       // for details..
       this->proxy_cache_[i] = 0;
     }
-
 }
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
@@ -412,26 +471,27 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -444,7 +504,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -453,7 +513,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -463,17 +523,16 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -485,13 +544,13 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer));
 
 
@@ -499,11 +558,17 @@ static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerObject_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -512,6 +577,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -522,20 +588,27 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->ping (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -544,6 +617,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -554,25 +628,25 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->shutdown (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-  return;
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -586,15 +660,15 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
     )->ping (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown  (
@@ -603,23 +677,26 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
     )->shutdown (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_ImplementationRepository::ServerObject::ServerObject (void)
 {
   this->optable_ = &tao_ImplementationRepository_ServerObject_optable;
@@ -633,9 +710,12 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_ImplementationRepository::ServerObject::ping_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -643,47 +723,58 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
   POA_ImplementationRepository::ServerObject *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::ServerObject *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
+  
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->ping (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->ping (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -693,29 +784,56 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -723,47 +841,58 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
   POA_ImplementationRepository::ServerObject *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::ServerObject *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
+  
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->shutdown (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->shutdown (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -773,98 +902,128 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
+  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::ServerObject::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
+  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::ServerObject::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
+  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -876,35 +1035,72 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_ImplementationRepository::ServerObject::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:ImplementationRepository/ServerObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_ImplementationRepository::ServerObject::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerObject:1.0") == 0)
-    return ACE_static_cast (POA_ImplementationRepository::ServerObject_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:ImplementationRepository/ServerObject:1.0") == 0)
+    {
+      return ACE_static_cast (POA_ImplementationRepository::ServerObject_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -913,6 +1109,9 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id
   return "IDL:ImplementationRepository/ServerObject:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_ImplementationRepository::ServerObject::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -925,29 +1124,50 @@ void POA_ImplementationRepository::ServerObject::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-ImplementationRepository::ServerObject*
+ImplementationRepository::ServerObject *
 POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -956,55 +1176,55 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 8:56:49 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/doctmp/pgontla/ImR/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 15,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 10,
-     39, 39,  5, 10,  0,  0, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39,  0, 39,  5,
-     39,  0, 39,  0, 39, 39, 39, 39, 39, 39,
-     39, 39,  5,  0, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34,  0,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34,  4,
+     34, 34,  0,  0,  0,  0, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34,  5, 34,  5,
+     34,  0, 34,  0, 34, 34, 34, 34, 34, 34,
+     34, 34,  5, 15, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34,
 #else
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 15, 39, 10, 39, 39,
-      5, 10,  0,  0, 39, 39, 39, 39,  0, 39,
-      5, 39,  0, 39,  0,  5,  0, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+     34, 34, 34, 34, 34,  0, 34,  4, 34, 34,
+      0,  0,  0,  0, 34, 34, 34, 34,  5, 34,
+      5, 34,  0, 34,  0,  5, 15, 34, 34, 34,
+     34, 34, 34, 34, 34, 34, 34, 34,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -1015,44 +1235,42 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
 {
   enum
     {
-      TOTAL_KEYWORDS = 13,
+      TOTAL_KEYWORDS = 14,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 28,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 38,
-      HASH_VALUE_RANGE = 35,
+      MAX_HASH_VALUE = 33,
+      HASH_VALUE_RANGE = 30,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 17
+      WORDLIST_SIZE = 18
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"list", 	&POA_ImplementationRepository::Administration::list_skel},
-      {"",0},{"",0},{"",0},{"",0},
       {"find", 	&POA_ImplementationRepository::Administration::find_skel},
-      {"",0},{"",0},{"",0},
+      {"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_ImplementationRepository::Administration::_is_a_skel},
+      {"_interface",  &POA_ImplementationRepository::Administration::_interface_skel},
+      {"",0},{"",0},
       {"remove_server", 	&POA_ImplementationRepository::Administration::remove_server_skel},
       {"",0},
       {"register_server", 	&POA_ImplementationRepository::Administration::register_server_skel},
       {"",0},
       {"reregister_server", 	&POA_ImplementationRepository::Administration::reregister_server_skel},
-      {"",0},{"",0},
-      {"shutdown_server", 	&POA_ImplementationRepository::Administration::shutdown_server_skel},
       {"",0},
-      {"server_is_running", 	&POA_ImplementationRepository::Administration::server_is_running_skel},
-      {"",0},{"",0},
       {"activate_server", 	&POA_ImplementationRepository::Administration::activate_server_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_ImplementationRepository::Administration::_non_existent_skel},
+      {"shutdown_server", 	&POA_ImplementationRepository::Administration::shutdown_server_skel},
       {"",0},
-      {"_is_a",  &POA_ImplementationRepository::Administration::_is_a_skel},
-      {"",0},{"",0},
-      {"server_is_shutting_down", 	&POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
+      {"server_is_running", 	&POA_ImplementationRepository::Administration::server_is_running_skel},
       {"",0},
-      {"_interface",  &POA_ImplementationRepository::Administration::_interface_skel},
+      {"list", 	&POA_ImplementationRepository::Administration::list_skel},
+      {"_component",  &POA_ImplementationRepository::Administration::_component_skel},
       {"",0},{"",0},
+      {"_non_existent",  &POA_ImplementationRepository::Administration::_non_existent_skel},
+      {"",0},{"",0},{"",0},
       {"activate_server_with_startup", 	&POA_ImplementationRepository::Administration::activate_server_with_startup_skel},
+      {"server_is_shutting_down", 	&POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1069,60 +1287,77 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
     }
   return 0;
 }
-/* ending time is 8:56:49 */
 static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server ACE_ENV_ARG_DECL_NOT_USED
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1130,43 +1365,46 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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_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)
     {
@@ -1178,9 +1416,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -1188,13 +1427,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1204,66 +1444,82 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::t
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server,
-    const CORBA::Long & check_startup ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const CORBA::Long & check_startup
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (char * result);
 
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
-  const CORBA::Long & check_startup_;
-  char * _result;
+  const CORBA::Long & check_startup_;char * _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
-    const CORBA::Long & check_startup ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::Long & check_startup
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1272,46 +1528,50 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= check_startup_;
+  
+  (*parameter_list)[len].argument <<= check_startup_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::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_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)
     {
@@ -1323,9 +1583,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -1333,17 +1594,18 @@ TAO_ServerRequestInfo_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 ();
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1353,72 +1615,87 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (char * result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const ImplementationRepository::StartupOptions & options
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
-    const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_NOT_USED
+    const ImplementationRepository::StartupOptions & options
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1427,45 +1704,49 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<=  this->options_;
+  
+  (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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_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)
     {
@@ -1477,9 +1758,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -1487,13 +1769,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1503,65 +1786,80 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::t
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const ImplementationRepository::StartupOptions & options
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
-    const ImplementationRepository::StartupOptions & options ACE_ENV_ARG_DECL_NOT_USED
+    const ImplementationRepository::StartupOptions & options
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1570,44 +1868,49 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<=  this->options_;
+  
+  (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -1615,13 +1918,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1631,62 +1935,77 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server ACE_ENV_ARG_DECL_NOT_USED
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1694,42 +2013,45 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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_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)
     {
@@ -1741,9 +2063,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -1751,13 +2074,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1767,62 +2091,77 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::tar
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server ACE_ENV_ARG_DECL_NOT_USED
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1830,42 +2169,45 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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_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)
     {
@@ -1877,9 +2219,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -1887,13 +2230,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1903,69 +2247,85 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::t
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const char * addr,
+      ImplementationRepository::ServerObject_ptr server_object
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (char * result);
 
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
   const char * addr_;
-  ImplementationRepository::ServerObject_ptr server_object_;
-  char * _result;
+  ImplementationRepository::ServerObject_ptr server_object_;char * _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object ACE_ENV_ARG_DECL_NOT_USED
+    ImplementationRepository::ServerObject_ptr server_object
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1975,48 +2335,53 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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 (3);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= addr_;
+  
+  (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<=  this->server_object_;
+  
+  (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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_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)
     {
@@ -2028,9 +2393,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -2038,17 +2404,18 @@ TAO_ServerRequestInfo_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 ();
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2058,69 +2425,84 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server ACE_ENV_ARG_DECL_NOT_USED
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2128,42 +2510,45 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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_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)
     {
@@ -2175,9 +2560,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -2185,13 +2571,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2201,62 +2588,77 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const char * server ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
+  
   const char * server_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server ACE_ENV_ARG_DECL_NOT_USED
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2264,42 +2666,45 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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 <<= server_;
+  
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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_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)
     {
@@ -2311,9 +2716,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
   return safe_exception_list._retn ();
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -2321,13 +2727,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2337,109 +2744,128 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
-    ,
-    const CORBA::ULong & how_many
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const CORBA::ULong & how_many      
 
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
+    );
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-  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_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const CORBA::ULong & how_many
- ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::ULong & how_many    
+
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
-    how_many_ (how_many)
+    how_many_ (how_many)  
 
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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 <<= how_many_;
+  
+  (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+    
 
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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_ServerRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -2447,13 +2873,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2463,7 +2890,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
@@ -2475,6 +2903,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker (void)
 {
@@ -2485,8 +2916,9 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *POA_
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO_Administration_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void)
@@ -2494,12 +2926,11 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TA
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     {
       delete this->proxy_cache_[i];
-
+      
       // Hack to prevent bug mentioned in 1204. Refer to 1204
       // for details..
       this->proxy_cache_[i] = 0;
     }
-
 }
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
@@ -2510,26 +2941,27 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -2542,7 +2974,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -2551,7 +2983,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -2561,17 +2993,16 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_Administration_Proxy_Broker *
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -2583,13 +3014,13 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB
 int
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long)
 {
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer));
 
 
@@ -2597,11 +3028,17 @@ static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factor
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Administration_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -2613,6 +3050,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
     , ImplementationRepository::CannotActivate
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2623,20 +3061,28 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->activate_server (
-        server ACE_ENV_ARG_PARAMETER
+        
+        server
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -2661,20 +3107,29 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::act
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK_RETURN (_tao_retval._retn ());
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval._retn ());
+  ACE_CHECK_RETURN (_tao_retval._retn ());
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK_RETURN (_tao_retval._retn ());
+  
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->activate_server_with_startup (
+        
         server,
-        check_startup ACE_ENV_ARG_PARAMETER
+        check_startup
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -2686,6 +3141,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
     , ImplementationRepository::AlreadyRegistered
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2696,21 +3152,29 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->register_server (
+        
         server,
-        options ACE_ENV_ARG_PARAMETER
+        options
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -2721,6 +3185,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2731,21 +3196,29 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->reregister_server (
+        
         server,
-        options ACE_ENV_ARG_PARAMETER
+        options
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -2756,6 +3229,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2766,20 +3240,28 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->remove_server (
-        server ACE_ENV_ARG_PARAMETER
+        
+        server
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -2790,6 +3272,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2800,20 +3283,28 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->shutdown_server (
-        server ACE_ENV_ARG_PARAMETER
+        
+        server
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -2838,21 +3329,30 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK_RETURN (_tao_retval._retn ());
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval._retn ());
+  ACE_CHECK_RETURN (_tao_retval._retn ());
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK_RETURN (_tao_retval._retn ());
+  
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_running (
+        
         server,
         addr,
-        server_object ACE_ENV_ARG_PARAMETER
+        server_object
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
     CORBA_Object *_collocated_tao_target_,
     const char * server
@@ -2863,6 +3363,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2873,20 +3374,28 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_shutting_down (
-        server ACE_ENV_ARG_PARAMETER
+        
+        server
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
@@ -2898,6 +3407,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2908,21 +3418,29 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->find (
+        
         server,
-        info ACE_ENV_ARG_PARAMETER
+        info
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
@@ -2934,6 +3452,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -2944,27 +3463,28 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->list (
+        
         how_many,
         server_list,
-        server_iterator ACE_ENV_ARG_PARAMETER
+        server_iterator
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -2981,15 +3501,16 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->activate_server (
-          server ACE_ENV_ARG_PARAMETER
+          
+          server
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup  (
@@ -3002,16 +3523,17 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::acti
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->activate_server_with_startup (
+          
           server,
-          check_startup ACE_ENV_ARG_PARAMETER
+          check_startup
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server  (
@@ -3023,16 +3545,17 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::AlreadyRegistered
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->register_server (
+          
           server,
-          options ACE_ENV_ARG_PARAMETER
+          options
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server  (
@@ -3043,16 +3566,17 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->reregister_server (
+          
           server,
-          options ACE_ENV_ARG_PARAMETER
+          options
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server  (
@@ -3063,15 +3587,16 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->remove_server (
-          server ACE_ENV_ARG_PARAMETER
+          
+          server
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server  (
@@ -3082,15 +3607,16 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->shutdown_server (
-          server ACE_ENV_ARG_PARAMETER
+          
+          server
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running  (
@@ -3103,17 +3629,18 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->server_is_running (
+          
           server,
           addr,
-          server_object ACE_ENV_ARG_PARAMETER
+          server_object
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down  (
@@ -3124,15 +3651,16 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->server_is_shutting_down (
-          server ACE_ENV_ARG_PARAMETER
+          
+          server
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find  (
@@ -3144,16 +3672,17 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->find (
+          
           server,
-          info ACE_ENV_ARG_PARAMETER
+          info
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list  (
@@ -3165,25 +3694,29 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->list (
+          
           how_many,
           server_list,
-          server_iterator ACE_ENV_ARG_PARAMETER
+          server_iterator
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_ImplementationRepository::Administration::Administration (void)
 {
   this->optable_ = &tao_ImplementationRepository_Administration_optable;
@@ -3197,9 +3730,12 @@ POA_ImplementationRepository::Administration::~Administration (void)
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3208,54 +3744,67 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
+  
   if (!(
-    (_tao_in >> server.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in () ACE_ENV_ARG_PARAMETER
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->activate_server (
-            server.in () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->activate_server (
+                
+                server.in ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3265,29 +3814,56 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3296,61 +3872,75 @@ void POA_ImplementationRepository::Administration::activate_server_with_startup_
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   CORBA::String_var _tao_retval;
   CORBA::String_var server;
   CORBA::Long check_startup;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> check_startup)
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> check_startup)
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      check_startup ACE_ENV_ARG_PARAMETER
+      
+      check_startup
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->activate_server_with_startup (
-            server.in (),
-            check_startup ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->activate_server_with_startup (
+                
+                server.in (),
+                
+                check_startup
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          char * _tao_retval_info = _tao_retval._retn ();
+          _tao_ri.result (_tao_retval_info);
+          _tao_retval = _tao_retval_info;
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      char * _tao_retval_info = _tao_retval._retn ();
-      _tao_ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3360,36 +3950,63 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::register_server_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3398,58 +4015,73 @@ void POA_ImplementationRepository::Administration::register_server_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> options)
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> options)
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      options ACE_ENV_ARG_PARAMETER
+      
+      options
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->register_server (
-            server.in (),
-            options ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->register_server (
+                
+                server.in (),
+                
+                options
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3459,29 +4091,56 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::reregister_server_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3490,58 +4149,73 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> options)
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> options)
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      options ACE_ENV_ARG_PARAMETER
+      
+      options
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->reregister_server (
-            server.in (),
-            options ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->reregister_server (
+                
+                server.in (),
+                
+                options
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3551,29 +4225,56 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3582,54 +4283,67 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
+  
   if (!(
-    (_tao_in >> server.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in () ACE_ENV_ARG_PARAMETER
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->remove_server (
-            server.in () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->remove_server (
+                
+                server.in ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3639,29 +4353,56 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3670,54 +4411,67 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
+  
   if (!(
-    (_tao_in >> server.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in () ACE_ENV_ARG_PARAMETER
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->shutdown_server (
-            server.in () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->shutdown_server (
+                
+                server.in ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3727,29 +4481,56 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3758,65 +4539,81 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   CORBA::String_var _tao_retval;
   CORBA::String_var server;
   CORBA::String_var addr;
   ImplementationRepository::ServerObject_var server_object;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> addr.out ()) &&
-    (_tao_in >> server_object.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> addr.out ()) &&
+      (_tao_in >> server_object.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
+      
       addr.in (),
-      server_object.in () ACE_ENV_ARG_PARAMETER
+      
+      server_object.in ()
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->server_is_running (
-            server.in (),
-            addr.in (),
-            server_object.in () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->server_is_running (
+                
+                server.in (),
+                
+                addr.in (),
+                
+                server_object.in ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          char * _tao_retval_info = _tao_retval._retn ();
+          _tao_ri.result (_tao_retval_info);
+          _tao_retval = _tao_retval_info;
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      char * _tao_retval_info = _tao_retval._retn ();
-      _tao_ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3826,36 +4623,63 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3864,54 +4688,67 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
+  
   if (!(
-    (_tao_in >> server.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in () ACE_ENV_ARG_PARAMETER
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->server_is_shutting_down (
-            server.in () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->server_is_shutting_down (
+                
+                server.in ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -3921,29 +4758,56 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -3952,55 +4816,69 @@ void POA_ImplementationRepository::Administration::find_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   ImplementationRepository::ServerInformation_var info;
+  
   if (!(
-    (_tao_in >> server.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in () ACE_ENV_ARG_PARAMETER
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->find (
-            server.in (),
-            info.out () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->find (
+                
+                server.in (),
+                
+                info.out ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -4010,36 +4888,63 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << info.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -4048,58 +4953,74 @@ void POA_ImplementationRepository::Administration::list_skel (
   POA_ImplementationRepository::Administration *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::Administration *,
-        _tao_object_reference
+        _tao_servant
       );
-    CORBA::ULong how_many;
+  
+  CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
-    ImplementationRepository::ServerInformationIterator_var server_iterator;
+  
+  ImplementationRepository::ServerInformationIterator_var server_iterator;
+  
   if (!(
-    (_tao_in >> how_many)
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> how_many)
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      how_many
- ACE_ENV_ARG_PARAMETER
-    );
+      
+      how_many      
 
+      ACE_ENV_ARG_PARAMETER
+    );
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->list (
-            how_many,
-            server_list.out (),
-            server_iterator.out () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->list (
+                
+                how_many,
+                
+                server_list.out (),
+                
+                server_iterator.out ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -4109,106 +5030,136 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << server_list.in ()) &&
       (_tao_out << server_iterator.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
+  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
+  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
+  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -4220,35 +5171,72 @@ void POA_ImplementationRepository::Administration::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_ImplementationRepository::Administration::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:ImplementationRepository/Administration:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_ImplementationRepository::Administration::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/Administration:1.0") == 0)
-    return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:ImplementationRepository/Administration:1.0") == 0)
+    {
+      return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -4257,6 +5245,9 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
   return "IDL:ImplementationRepository/Administration:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_ImplementationRepository::Administration::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -4269,29 +5260,50 @@ void POA_ImplementationRepository::Administration::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-ImplementationRepository::Administration*
+ImplementationRepository::Administration *
 POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ());
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -4300,55 +5312,55 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 8:56:49 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/doctmp/pgontla/ImR/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14,  0,  0, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14,  0, 14, 14, 14, 14,  0, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
+     16, 16,  0,  5, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16,  0, 16, 16, 16, 16,  0, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16,
 #else
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14,  0, 14,  0, 14, 14,
-      0,  0, 14, 14, 14, 14, 14, 14, 14, 14,
-      0, 14, 14, 14, 14, 14,  0, 14, 14, 14,
-     14,  0, 14, 14, 14, 14, 14, 14,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16,  0, 16,  0, 16, 16,
+      0,  5, 16, 16, 16, 16, 16, 16, 16, 16,
+      0, 16, 16, 16, 16, 16,  0, 16, 16, 16,
+     16,  0, 16, 16, 16, 16, 16, 16,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -4359,14 +5371,14 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
 {
   enum
     {
-      TOTAL_KEYWORDS = 5,
+      TOTAL_KEYWORDS = 6,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 13,
-      HASH_VALUE_RANGE = 9,
+      MAX_HASH_VALUE = 15,
+      HASH_VALUE_RANGE = 11,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 10
+      WORDLIST_SIZE = 11
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
@@ -4376,9 +5388,11 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
       {"next_n", 	&POA_ImplementationRepository::ServerInformationIterator::next_n_skel},
       {"destroy", 	&POA_ImplementationRepository::ServerInformationIterator::destroy_skel},
       {"",0},{"",0},
-      {"_interface",  &POA_ImplementationRepository::ServerInformationIterator::_interface_skel},
+      {"_component",  &POA_ImplementationRepository::ServerInformationIterator::_component_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel},
+      {"",0},
+      {"_interface",  &POA_ImplementationRepository::ServerInformationIterator::_interface_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4395,61 +5409,79 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
     }
   return 0;
 }
-/* ending time is 8:56:49 */
 static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
-    ,
-    const CORBA::ULong & how_many ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::ServerInformationIterator *tao_impl,
+      const CORBA::ULong & how_many
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Boolean result);
 
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
+    );
+  
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-  const CORBA::ULong & how_many_;
-  CORBA::Boolean _result;
+  
+  const CORBA::ULong & how_many_;CORBA::Boolean _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-    const CORBA::ULong & how_many ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::ULong & how_many
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4457,41 +5489,45 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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 <<= how_many_;
+  
+  (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -4499,17 +5535,18 @@ TAO_ServerRequestInfo_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 ();
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4519,98 +5556,118 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::ServerInformationIterator *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
+    );
+  
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-
+  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_ImplementationRepository::ServerInformationIterator *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_ImplementationRepository::ServerInformationIterator *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::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_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::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_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -4618,13 +5675,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4634,7 +5692,8 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
@@ -4646,6 +5705,9 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
@@ -4656,8 +5718,9 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
@@ -4665,12 +5728,11 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     {
       delete this->proxy_cache_[i];
-
+      
       // Hack to prevent bug mentioned in 1204. Refer to 1204
       // for details..
       this->proxy_cache_[i] = 0;
     }
-
 }
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
@@ -4681,26 +5743,27 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -4713,7 +5776,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -4722,7 +5785,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -4732,17 +5795,16 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -4754,13 +5816,13 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun
 int
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long)
 {
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer));
 
 
@@ -4768,11 +5830,17 @@ static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
@@ -4795,20 +5863,29 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK_RETURN (_tao_retval);
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval);
+  ACE_CHECK_RETURN (_tao_retval);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK_RETURN (_tao_retval);
+  
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
     )->next_n (
+        
         how_many,
-        server_list ACE_ENV_ARG_PARAMETER
+        server_list
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -4817,6 +5894,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -4827,25 +5905,25 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
-    ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+  ACE_CHECK;
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
+  ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
     )->destroy (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-  return;
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -4861,16 +5939,17 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
     )->next_n (
+          
           how_many,
-          server_list ACE_ENV_ARG_PARAMETER
+          server_list
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy  (
@@ -4879,23 +5958,26 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
     )->destroy (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
 {
   this->optable_ = &tao_ImplementationRepository_ServerInformationIterator_optable;
@@ -4909,9 +5991,12 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -4920,58 +6005,72 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::ServerInformationIterator *,
-        _tao_object_reference
+        _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
-    if (!(
-    (_tao_in >> how_many)
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+  
+  
+  if (!(
+      (_tao_in >> how_many)
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      how_many ACE_ENV_ARG_PARAMETER
+      
+      how_many
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->next_n (
-            how_many,
-            server_list.out () ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->next_n (
+                
+                how_many,
+                
+                server_list.out ()
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      _tao_ri.result (_tao_retval_info);
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -4981,37 +6080,64 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << CORBA::Any::from_boolean (_tao_retval)) &&
       (_tao_out << server_list.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -5019,47 +6145,58 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     ACE_static_cast (
         POA_ImplementationRepository::ServerInformationIterator *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
+  
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->destroy (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->destroy (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -5069,98 +6206,128 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -5172,35 +6339,72 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerInformationIterator:1.0") == 0)
-    return ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:ImplementationRepository/ServerInformationIterator:1.0") == 0)
+    {
+      return ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -5209,6 +6413,9 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -5221,29 +6428,45 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-ImplementationRepository::ServerInformationIterator*
+ImplementationRepository::ServerInformationIterator *
 POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 870f2188194..d2dcef1251c 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -19,13 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IMPLREPOS_H_
-#define _TAO_IDL_IMPLREPOS_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
+#define _TAO_IDL_ORIG_IMPLREPOS_H_
 
 #include "ace/pre.h"
 #include "ImplRepoC.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -47,11 +49,17 @@
 #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_module/module_sh.cpp:49
+
 TAO_NAMESPACE  POA_ImplementationRepository
 {
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_ServerObject_ThruPOA_Proxy_Impl;
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
@@ -61,92 +69,102 @@ TAO_NAMESPACE  POA_ImplementationRepository
   {
   protected:
     ServerObject (void);
-
+  
   public:
     ServerObject (const ServerObject& rhs);
     virtual ~ServerObject (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::ServerObject *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void ping (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
-        static void ping_skel (
+    static void ping_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void shutdown (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
-        static void shutdown_skel (
+    static void shutdown_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
-
-  };
-
+  };  
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
   {
   public: 
@@ -182,7 +200,6 @@ TAO_NAMESPACE  POA_ImplementationRepository
     static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void);
   };
   
-  
   //
   //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
@@ -192,6 +209,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //                    ThruPOA  Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  
   class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
     public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
@@ -199,7 +219,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
   public:
     _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
     
-    virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { }
+    virtual ~_TAO_ServerObject_ThruPOA_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_
@@ -209,6 +232,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         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
@@ -216,15 +242,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
@@ -236,7 +258,10 @@ class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl :
 public:
   _TAO_ServerObject_Direct_Proxy_Impl (void);
   
-  virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { }
+  virtual ~_TAO_ServerObject_Direct_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_
@@ -246,25 +271,28 @@ public:
       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
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));
-  
-  };
+    ));};
 
 
 //
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
 
 class Administration;
 typedef Administration *Administration_ptr;
-// Forward Classes Declaration
+
 class _TAO_Administration_ThruPOA_Proxy_Impl;
 class _TAO_Administration_Direct_Proxy_Impl;
 class _TAO_Administration_Strategized_Proxy_Broker;
@@ -278,50 +306,59 @@ protected:
 public:
   Administration (const Administration& rhs);
   virtual ~Administration (void);
-
-
+  
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual void* _downcast (
       const char* logical_type_id
     );
-
+  
   static void _is_a_skel (
       TAO_ServerRequest &req,
-      void *obj,
+      void *servant,
       void *servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   static void _non_existent_skel (
       TAO_ServerRequest &req,
-      void *obj,
+      void *servant,
       void *servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   static void _interface_skel (
       TAO_ServerRequest &req,
+      void *servant,
+      void *servant_upcall
+      ACE_ENV_ARG_DECL
+    );
+  
+  static void _component_skel (
+      TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   ::ImplementationRepository::Administration *_this (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual const char* _interface_repository_id (void) const;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void activate_server (
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -332,13 +369,16 @@ public:
       , ImplementationRepository::CannotActivate
     )) = 0;
   
-    static void activate_server_skel (
+  static void activate_server_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual char * activate_server_with_startup (
       const char * server,
       CORBA::Long check_startup
@@ -350,13 +390,16 @@ public:
       , ImplementationRepository::CannotActivate
     )) = 0;
   
-    static void activate_server_with_startup_skel (
+  static void activate_server_with_startup_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void register_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options
@@ -367,13 +410,16 @@ public:
       , ImplementationRepository::AlreadyRegistered
     )) = 0;
   
-    static void register_server_skel (
+  static void register_server_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void reregister_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options
@@ -383,13 +429,16 @@ public:
       CORBA::SystemException
     )) = 0;
   
-    static void reregister_server_skel (
+  static void reregister_server_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void remove_server (
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -399,13 +448,16 @@ public:
       , ImplementationRepository::NotFound
     )) = 0;
   
-    static void remove_server_skel (
+  static void remove_server_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void shutdown_server (
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -415,13 +467,16 @@ public:
       , ImplementationRepository::NotFound
     )) = 0;
   
-    static void shutdown_server_skel (
+  static void shutdown_server_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual char * server_is_running (
       const char * server,
       const char * addr,
@@ -433,13 +488,16 @@ public:
       , ImplementationRepository::NotFound
     )) = 0;
   
-    static void server_is_running_skel (
+  static void server_is_running_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void server_is_shutting_down (
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -449,13 +507,16 @@ public:
       , ImplementationRepository::NotFound
     )) = 0;
   
-    static void server_is_shutting_down_skel (
+  static void server_is_shutting_down_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void find (
       const char * server,
       ImplementationRepository::ServerInformation_out info
@@ -466,13 +527,16 @@ public:
       , ImplementationRepository::NotFound
     )) = 0;
   
-    static void find_skel (
+  static void find_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void list (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
@@ -483,21 +547,21 @@ public:
       CORBA::SystemException
     )) = 0;
   
-    static void list_skel (
+  static void list_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
-
 };
 
-
 ///////////////////////////////////////////////////////////////////////
 //               Strategized Proxy Broker Declaration 
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+
 class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
 {
 public: 
@@ -533,7 +597,6 @@ public:
   static _TAO_Administration_Strategized_Proxy_Broker *the_TAO_Administration_Strategized_Proxy_Broker (void);
 };
 
-
 //
 //            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
@@ -543,6 +606,9 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+
 class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
@@ -550,7 +616,10 @@ class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl :
 public:
   _TAO_Administration_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_Administration_ThruPOA_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_,
@@ -563,6 +632,9 @@ public:
       , 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,
@@ -575,6 +647,9 @@ public:
       , 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,
@@ -586,6 +661,9 @@ public:
       , 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,
@@ -596,6 +674,9 @@ public:
       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
@@ -606,6 +687,9 @@ public:
       , 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
@@ -616,6 +700,9 @@ public:
       , 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,
@@ -628,6 +715,9 @@ public:
       , 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
@@ -638,6 +728,9 @@ public:
       , 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,
@@ -649,6 +742,9 @@ public:
       , 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,
@@ -659,15 +755,11 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
 };
 
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
@@ -679,7 +771,10 @@ class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl :
 public:
   _TAO_Administration_Direct_Proxy_Impl (void);
   
-  virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { }
+  virtual ~_TAO_Administration_Direct_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_,
@@ -692,6 +787,9 @@ public:
       , 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,
@@ -704,6 +802,9 @@ public:
       , 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,
@@ -715,6 +816,9 @@ public:
       , 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,
@@ -725,6 +829,9 @@ public:
       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
@@ -735,6 +842,9 @@ public:
       , 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
@@ -745,6 +855,9 @@ public:
       , 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,
@@ -757,6 +870,9 @@ public:
       , 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
@@ -767,6 +883,9 @@ public:
       , 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,
@@ -778,6 +897,9 @@ public:
       , 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,
@@ -787,19 +909,19 @@ public:
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));
-  
-  };
+    ));};
 
 
 //
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
 
 class ServerInformationIterator;
 typedef ServerInformationIterator *ServerInformationIterator_ptr;
-// Forward Classes Declaration
+
 class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
 class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
 class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
@@ -813,50 +935,59 @@ protected:
 public:
   ServerInformationIterator (const ServerInformationIterator& rhs);
   virtual ~ServerInformationIterator (void);
-
-
+  
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual void* _downcast (
       const char* logical_type_id
     );
-
+  
   static void _is_a_skel (
       TAO_ServerRequest &req,
-      void *obj,
+      void *servant,
       void *servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   static void _non_existent_skel (
       TAO_ServerRequest &req,
-      void *obj,
+      void *servant,
       void *servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   static void _interface_skel (
       TAO_ServerRequest &req,
+      void *servant,
+      void *servant_upcall
+      ACE_ENV_ARG_DECL
+    );
+  
+  static void _component_skel (
+      TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
   ::ImplementationRepository::ServerInformationIterator *_this (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual const char* _interface_repository_id (void) const;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
@@ -866,36 +997,38 @@ public:
       CORBA::SystemException
     )) = 0;
   
-    static void next_n_skel (
+  static void next_n_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
   virtual void destroy (
-      
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
   
-    static void destroy_skel (
+  static void destroy_skel (
       TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
+      void *_tao_servant,
       void *_tao_servant_upcall
       ACE_ENV_ARG_DECL
     );
-
-
 };
 
-
 ///////////////////////////////////////////////////////////////////////
 //               Strategized Proxy Broker Declaration 
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
 {
 public: 
@@ -931,7 +1064,6 @@ public:
   static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
 };
 
-
 //
 //            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
@@ -941,6 +1073,9 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
@@ -948,7 +1083,10 @@ class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Imp
 public:
   _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ServerInformationIterator_ThruPOA_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_,
@@ -960,6 +1098,9 @@ public:
       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
@@ -967,15 +1108,11 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
 };
 
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
@@ -987,7 +1124,10 @@ class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
 public:
   _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
   
-  virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { }
+  virtual ~_TAO_ServerInformationIterator_Direct_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_,
@@ -999,15 +1139,16 @@ public:
       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
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));
-  
-  };
+    ));};
 
 
 //
@@ -1015,9 +1156,16 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+
 #include "ImplRepoS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i
index f455a06b8f0..e86a7e25a26 100644
--- a/TAO/tao/PortableServer/ImplRepoS.i
+++ b/TAO/tao/PortableServer/ImplRepoS.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/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp
index 016d28b09a2..c02c3ce9c7c 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IMPLREPOS_T_CPP_
-#define _TAO_IDL_IMPLREPOS_T_CPP_
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
+#define _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
 
 #include "ImplRepoS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index 98b3f91a85a..72533274cde 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -19,10 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IMPLREPOS_T_H_
-#define _TAO_IDL_IMPLREPOS_T_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_H_
+#define _TAO_IDL_ORIG_IMPLREPOS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -30,9 +34,17 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_ImplementationRepository
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ServerObject_tie : public ServerObject
@@ -42,9 +54,13 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // the T& ctor
     ServerObject_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    ServerObject_tie (T *tp, CORBA::Boolean release=1);
+    ServerObject_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    ServerObject_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~ServerObject_tie (void);
     // dtor
@@ -54,7 +70,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -65,23 +81,28 @@ TAO_NAMESPACE  POA_ImplementationRepository
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     void ping (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
     
-        void shutdown (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -90,7 +111,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
     ServerObject_tie (const ServerObject_tie &);
     void operator= (const ServerObject_tie &);
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  Administration_tie : public Administration
@@ -100,9 +124,13 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // the T& ctor
     Administration_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    Administration_tie (T *tp, CORBA::Boolean release=1);
+    Administration_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    Administration_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~Administration_tie (void);
     // dtor
@@ -112,7 +140,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -123,6 +151,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -133,7 +165,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        char * activate_server_with_startup (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    char * activate_server_with_startup (
         const char * server,
         CORBA::Long check_startup
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -144,7 +179,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        void register_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -154,7 +192,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
-        void reregister_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -163,7 +204,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
       ));
     
-        void remove_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -172,7 +216,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void shutdown_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -181,7 +228,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        char * server_is_running (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    char * server_is_running (
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
@@ -192,7 +242,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void server_is_shutting_down (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -201,7 +254,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void find (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -211,7 +267,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void list (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -220,8 +279,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -230,7 +289,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
     Administration_tie (const Administration_tie &);
     void operator= (const Administration_tie &);
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ServerInformationIterator_tie : public ServerInformationIterator
@@ -240,9 +302,13 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // the T& ctor
     ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    ServerInformationIterator_tie (T *tp, CORBA::Boolean release=1);
+    ServerInformationIterator_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    ServerInformationIterator_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~ServerInformationIterator_tie (void);
     // dtor
@@ -252,7 +318,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -263,6 +329,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     CORBA::Boolean next_n (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
@@ -272,15 +342,17 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
       ));
     
-        void destroy (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -289,21 +361,21 @@ TAO_NAMESPACE  POA_ImplementationRepository
     ServerInformationIterator_tie (const ServerInformationIterator_tie &);
     void operator= (const ServerInformationIterator_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+
 #if defined (__ACE_INLINE__)
 #include "ImplRepoS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ImplRepoS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("ImplRepoS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index 8c7e6ebaaab..66cade35fb1 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -19,6 +19,10 @@
 // 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_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -52,7 +56,10 @@ POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, Port
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::~ServerObject_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -64,7 +71,11 @@ POA_ImplementationRepository::ServerObject_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::ServerObject_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -72,7 +83,11 @@ POA_ImplementationRepository::ServerObject_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::ServerObject_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -93,14 +108,18 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->ServerObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::ping  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -108,13 +127,15 @@ void POA_ImplementationRepository::ServerObject_tie<T>::ping  (
   ))
 {
   this->ptr_->ping (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -122,12 +143,15 @@ void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
   ))
 {
   this->ptr_->shutdown (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -161,7 +185,10 @@ POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp,
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::~Administration_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -173,7 +200,11 @@ POA_ImplementationRepository::Administration_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::Administration_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -181,7 +212,11 @@ POA_ImplementationRepository::Administration_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::Administration_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -202,11 +237,16 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_ImplementationRepository::Administration_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->Administration::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
     const char * server
@@ -219,10 +259,14 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
   ))
 {
   this->ptr_->activate_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Administration_tie<T>::activate_server_with_startup  (
     const char * server,
@@ -236,11 +280,15 @@ char * POA_ImplementationRepository::Administration_tie<T>::activate_server_with
   ))
 {
   return this->ptr_->activate_server_with_startup (
-server,
-    check_startup ACE_ENV_ARG_PARAMETER
+    server,
+    check_startup
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::register_server  (
     const char * server,
@@ -253,11 +301,15 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server  (
   ))
 {
   this->ptr_->register_server (
-server,
-    options ACE_ENV_ARG_PARAMETER
+    server,
+    options
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
     const char * server,
@@ -269,11 +321,15 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
   ))
 {
   this->ptr_->reregister_server (
-server,
-    options ACE_ENV_ARG_PARAMETER
+    server,
+    options
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
     const char * server
@@ -285,10 +341,14 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
   ))
 {
   this->ptr_->remove_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
     const char * server
@@ -300,10 +360,14 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
   ))
 {
   this->ptr_->shutdown_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
     const char * server,
@@ -317,12 +381,16 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
   ))
 {
   return this->ptr_->server_is_running (
-server,
+    server,
     addr,
-    server_object ACE_ENV_ARG_PARAMETER
+    server_object
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_down  (
     const char * server
@@ -334,10 +402,14 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow
   ))
 {
   this->ptr_->server_is_shutting_down (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::find  (
     const char * server,
@@ -350,11 +422,15 @@ void POA_ImplementationRepository::Administration_tie<T>::find  (
   ))
 {
   this->ptr_->find (
-server,
-    info ACE_ENV_ARG_PARAMETER
+    server,
+    info
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::list  (
     CORBA::ULong how_many,
@@ -367,14 +443,18 @@ void POA_ImplementationRepository::Administration_tie<T>::list  (
   ))
 {
   this->ptr_->list (
-how_many,
+    how_many,
     server_list,
-    server_iterator ACE_ENV_ARG_PARAMETER
+    server_iterator
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -408,7 +488,10 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformatio
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::~ServerInformationIterator_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -420,7 +503,11 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_tied_object (vo
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -428,7 +515,11 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_tied_object (T
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -449,11 +540,16 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->ServerInformationIterator::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::next_n  (
     CORBA::ULong how_many,
@@ -465,14 +561,17 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n
   ))
 {
   return this->ptr_->next_n (
-how_many,
-    server_list ACE_ENV_ARG_PARAMETER
+    how_many,
+    server_list
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -480,7 +579,7 @@ void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy  (
   ))
 {
   this->ptr_->destroy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 8912ef09302..3f3dd326dbc 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -807,7 +807,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
        ++j)
     {
       const TAO_Profile *profile = mp.get_profile (j);
-      TAO_ObjectKey_var objkey = profile->_key ();
+      TAO::ObjectKey_var objkey = profile->_key ();
 
       if (ACE_OS::memcmp (objkey->get_buffer (),
                           &TAO_POA::objectkey_prefix[0],
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index 2a5fcffebaf..d1cb1630b7f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -44,7 +44,7 @@ TAO_Object_Adapter::transient_poa_name_size ()
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
+TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key
                                     ACE_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
@@ -55,7 +55,7 @@ TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
+TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
                                   PortableServer::Servant &servant
                                   ACE_ENV_ARG_DECL)
 {
@@ -279,12 +279,12 @@ TAO_POA_Current_Impl::object_id (void) const
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::object_key (const TAO_ObjectKey &key)
+TAO_POA_Current_Impl::object_key (const TAO::ObjectKey &key)
 {
   this->object_key_ = &key;
 }
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_POA_Current_Impl::object_key (void) const
 {
   return *this->object_key_;
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index d65dd572700..3c0477ce24d 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -2136,7 +2136,7 @@ TAO_POA::reference_to_servant_i (CORBA::Object_ptr reference
   int result = -1;
   if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     {
-      TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
+      TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // If the object reference was not created by this POA, the
@@ -2265,7 +2265,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference
   // POA on which the operation is being performed.  If the object
   // reference was not created by this POA, the WrongAdapter exception
   // is raised.
-  TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   PortableServer::ObjectId system_id;
@@ -2429,7 +2429,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
                                                                            priority) == 0)
     {
       // Create object key.
-      TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
+      TAO::ObjectKey_var key = this->create_object_key (system_id.in ());
 
       // Ask the ORB to create you a reference
       return this->key_to_object (key.in (),
@@ -3378,7 +3378,7 @@ TAO_POA::invoke_key_to_object (const char *intf,
     }
 
   // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
+  TAO::ObjectKey_var key = this->create_object_key (system_id.in ());
 
   CORBA::Object_var object = 0;
 
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index e3f602e7e89..e1563aaefbd 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -474,7 +474,7 @@ public:
 
   CORBA::Boolean cleanup_in_progress (void);
 
-  static int parse_ir_object_key (const TAO_ObjectKey &object_key,
+  static int parse_ir_object_key (const TAO::ObjectKey &object_key,
                                   PortableServer::ObjectId &user_id);
   // Calls protected static method used when POACurrent is not appropriate.
 
@@ -484,7 +484,7 @@ public:
 
   /// Create the correct stub, properly initialized with the
   /// attributes and policies attached to the current POA.
-  TAO_Stub* key_to_stub (const TAO_ObjectKey &key,
+  TAO_Stub* key_to_stub (const TAO::ObjectKey &key,
                          const char *type_id,
                          CORBA::Short priority
                          ACE_ENV_ARG_DECL);
@@ -621,7 +621,7 @@ protected:
                                           &user_id
                                           ACE_ENV_ARG_DECL);
 
-  CORBA::Object_ptr key_to_object (const TAO_ObjectKey &key,
+  CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    TAO_ServantBase *servant,
                                    CORBA::Boolean collocated,
@@ -630,13 +630,13 @@ protected:
   // Wrapper for the ORB's key_to_object that will alter the object pointer
   // if the ImplRepo is used.
 
-  virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key,
+  virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
   // Like key_to_stub() but assume that the ORB is not shutting down.
 
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
+  TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
@@ -766,11 +766,11 @@ protected:
 
   void set_id (void);
 
-  TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
+  TAO::ObjectKey *create_object_key (const PortableServer::ObjectId &id);
 
   int is_poa_generated_id (const PortableServer::ObjectId &id);
 
-  static int parse_key (const TAO_ObjectKey &key,
+  static int parse_key (const TAO::ObjectKey &key,
                         TAO_Object_Adapter::poa_name &poa_system_name,
                         PortableServer::ObjectId &system_id,
                         CORBA::Boolean &is_root,
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index ee4f0638582..feae1488fe4 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -19,11 +19,15 @@
 // 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:670
+
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
 #define _TAO_IDL_ORIG_POLICYS_CPP_
 
-#include "PolicyS.h"
 
+#include "PolicyS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -31,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -40,6 +43,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -48,6 +52,11 @@
 #include "PolicyS.i"
 #endif /* !defined INLINE */
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+
 class TAO_CORBA_Policy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -55,55 +64,55 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 19:31:31 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
-     17,  0,  0,  0, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17,  0, 17, 17, 17, 17,  0, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22,  0,  0,  5, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22,  0, 22, 22, 22, 22,  0, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,
 #else
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22,  0, 22,  0, 22,  0,
+      0,  5, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
+     22,  0, 22, 22, 22, 22, 22, 22,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -114,29 +123,31 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 16,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
+      MAX_HASH_VALUE = 21,
+      HASH_VALUE_RANGE = 18,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 10
+      WORDLIST_SIZE = 11
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"copy",  &POA_CORBA::Policy::copy_skel},
+      {"copy", 	&POA_CORBA::Policy::copy_skel},
       {"_is_a",  &POA_CORBA::Policy::_is_a_skel},
       {"",0},
-      {"destroy",       &POA_CORBA::Policy::destroy_skel},
+      {"destroy", 	&POA_CORBA::Policy::destroy_skel},
       {"",0},{"",0},
-      {"_interface",  &POA_CORBA::Policy::_interface_skel},
+      {"_component",  &POA_CORBA::Policy::_component_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA::Policy::_non_existent_skel},
-      {"",0},{"",0},
-      {"_get_policy_type",      &POA_CORBA::Policy::_get_policy_type_skel},
+      {"",0},
+      {"_interface",  &POA_CORBA::Policy::_interface_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_get_policy_type", 	&POA_CORBA::Policy::_get_policy_type_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -153,90 +164,113 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
     }
   return 0;
 }
-/* ending time is 19:31:31 */
 static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_Policy_policy_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::PolicyType result);
 
 private:
-  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &);
-
+  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
+      const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
+    );
+  
 private:
   POA_CORBA::Policy *_tao_impl;
   CORBA::PolicyType _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_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_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_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;
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -244,17 +278,18 @@ TAO_ServerRequestInfo_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 ();
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -264,99 +299,120 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_Policy_copy : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Policy_copy (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::Policy_ptr result);
 
 private:
-  TAO_ServerRequestInfo_CORBA_Policy_copy (const TAO_ServerRequestInfo_CORBA_Policy_copy &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_Policy_copy &);
-
+  TAO_ServerRequestInfo_CORBA_Policy_copy (
+      const TAO_ServerRequestInfo_CORBA_Policy_copy &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_copy &
+    );
+  
 private:
   POA_CORBA::Policy *_tao_impl;
   ::CORBA::Policy_ptr _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::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_ServerRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::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_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_copy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -364,17 +420,18 @@ TAO_ServerRequestInfo_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 ();
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -384,98 +441,118 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_Policy_destroy : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Policy_destroy (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_CORBA_Policy_destroy (const TAO_ServerRequestInfo_CORBA_Policy_destroy &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_Policy_destroy &);
-
+  TAO_ServerRequestInfo_CORBA_Policy_destroy (
+      const TAO_ServerRequestInfo_CORBA_Policy_destroy &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_destroy &
+    );
+  
 private:
   POA_CORBA::Policy *_tao_impl;
-
+  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::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_ServerRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::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_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_destroy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -483,13 +560,14 @@ TAO_ServerRequestInfo_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;
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -499,7 +577,8 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
@@ -511,6 +590,9 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void)
 {
@@ -521,15 +603,21 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategi
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    delete this->proxy_cache_[i];
-
+    {
+      delete this->proxy_cache_[i];
+      
+      // Hack to prevent bug mentioned in 1204. Refer to 1204
+      // for details..
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 CORBA::_TAO_Policy_Proxy_Impl&
@@ -540,26 +628,27 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -572,7 +661,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -581,7 +670,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -591,17 +680,16 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 CORBA::_TAO_Policy_Proxy_Broker *
 CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -613,13 +701,13 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 int
 CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (long)
 {
-  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_Policy_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer));
 
 
@@ -627,11 +715,17 @@ static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -648,23 +742,31 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
   CORBA::Object_var forward_to;
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
-      "policy_type",
+      "_get_policy_type",
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval);
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK_RETURN (_tao_retval);
+  
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->policy_type (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 ::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -686,18 +788,26 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval._retn ());
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK_RETURN (_tao_retval._retn ());
+  
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->copy (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -706,6 +816,7 @@ void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -717,24 +828,24 @@ void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->destroy (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-  return;
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -748,15 +859,15 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->policy_type (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 ::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy  (
@@ -765,15 +876,15 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->copy (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy  (
@@ -782,23 +893,26 @@ void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->destroy (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_CORBA::Policy::Policy (void)
 {
   this->optable_ = &tao_CORBA_Policy_optable;
@@ -812,9 +926,12 @@ POA_CORBA::Policy::~Policy (void)
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_CORBA::Policy::_get_policy_type_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -822,49 +939,59 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   POA_CORBA::Policy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::Policy *,
-        _tao_object_reference
+        _tao_servant
       );
   CORBA::PolicyType _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->policy_type (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->policy_type (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          CORBA::PolicyType _tao_retval_info = _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      CORBA::PolicyType _tao_retval_info = _tao_retval;
-      _tao_ri.result (_tao_retval_info);
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -874,36 +1001,63 @@ void POA_CORBA::Policy::_get_policy_type_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval)
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_CORBA::Policy::copy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -911,50 +1065,60 @@ void POA_CORBA::Policy::copy_skel (
   POA_CORBA::Policy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::Policy *,
-        _tao_object_reference
+        _tao_servant
       );
   ::CORBA::Policy_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_Policy_copy _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->copy (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->copy (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          _tao_ri.result (_tao_retval_info);
+          _tao_retval = _tao_retval_info;
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
-      _tao_ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -964,36 +1128,63 @@ void POA_CORBA::Policy::copy_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_CORBA::Policy::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -1001,47 +1192,58 @@ void POA_CORBA::Policy::destroy_skel (
   POA_CORBA::Policy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::Policy *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
+  
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_Policy_destroy _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->destroy (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->destroy (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -1051,98 +1253,128 @@ void POA_CORBA::Policy::destroy_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       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;
+        {
+          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.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      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;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -1154,35 +1386,72 @@ void POA_CORBA::Policy::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_CORBA::Policy::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_CORBA::Policy::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_CORBA::Policy::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Policy:1.0") == 0)
+    {
+      return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -1191,6 +1460,9 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Policy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -1203,29 +1475,45 @@ void POA_CORBA::Policy::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-CORBA::Policy*
+CORBA::Policy *
 POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::CORBA::Policy::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 1b819c63f3f..464c4dbfd87 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -19,13 +19,15 @@
 // 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:443
+
 #ifndef _TAO_IDL_ORIG_POLICYS_H_
 #define _TAO_IDL_ORIG_POLICYS_H_
 
 #include "ace/pre.h"
 #include "tao/PolicyC.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -47,133 +49,151 @@
 #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_module/module_sh.cpp:49
+
 TAO_NAMESPACE  POA_CORBA
 {
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  
   class Policy;
   typedef Policy *Policy_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_Policy_ThruPOA_Proxy_Impl;
   class _TAO_Policy_Direct_Proxy_Impl;
   class _TAO_Policy_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Policy
     : public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
-
+  
   public:
     Policy (const Policy& rhs);
     virtual ~Policy (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::CORBA::Policy *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual CORBA::PolicyType policy_type (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void _get_policy_type_skel (
+    
+    static void _get_policy_type_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual ::CORBA::Policy_ptr copy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void copy_skel (
+    
+    static void copy_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void destroy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void destroy_skel (
+    
+    static void destroy_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
-
-  };
-
-
+  };  
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  
   class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     virtual ::CORBA::_TAO_Policy_Proxy_Impl &select_proxy (
       ::CORBA::Policy *object
       ACE_ENV_ARG_DECL
     );
-
+  
   private:
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
@@ -181,41 +201,46 @@ TAO_NAMESPACE  POA_CORBA
       int collocation_strategy
       ACE_ENV_ARG_DECL
     );
-
+    
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::CORBA::_TAO_Policy_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+    
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-
+  
   public:
     static _TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void);
   };
-
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-
-  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl :
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  
+  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl : 
     public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
   public:
     _TAO_Policy_ThruPOA_Proxy_Impl (void);
-
-    virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) { }
-
+    
+    virtual ~_TAO_Policy_ThruPOA_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
@@ -223,7 +248,10 @@ TAO_NAMESPACE  POA_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
@@ -231,7 +259,10 @@ TAO_NAMESPACE  POA_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
@@ -239,28 +270,27 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl : 
   public virtual CORBA::_TAO_Policy_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_Policy_Direct_Proxy_Impl (void);
-
-  virtual ~_TAO_Policy_Direct_Proxy_Impl (void) { }
-
+  
+  virtual ~_TAO_Policy_Direct_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
@@ -268,7 +298,10 @@ public:
     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
@@ -276,16 +309,17 @@ public:
     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
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));
-
-  };
+    ));};
 
 
 //
@@ -293,9 +327,16 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+
 #include "PolicyS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/PolicyS.i b/TAO/tao/PortableServer/PolicyS.i
index f455a06b8f0..e86a7e25a26 100644
--- a/TAO/tao/PortableServer/PolicyS.i
+++ b/TAO/tao/PortableServer/PolicyS.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/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 9e19877a5df..12fd2e6c3b9 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -19,6 +19,9 @@
 // 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:777
+
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
 #define _TAO_IDL_ORIG_POLICYS_T_CPP_
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 0733d3dec1b..160854e46d7 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -19,10 +19,14 @@
 // 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:604
+
 #ifndef _TAO_IDL_ORIG_POLICYS_T_H_
 #define _TAO_IDL_ORIG_POLICYS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -30,89 +34,108 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class Policy_tie : public Policy
+  class  Policy_tie : public Policy
   {
   public:
     Policy_tie (T &t);
     // the T& ctor
     Policy_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    Policy_tie (T *tp, CORBA::Boolean release=1);
+    Policy_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    Policy_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~Policy_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     CORBA::PolicyType policy_type (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-        ::CORBA::Policy_ptr copy (
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-        void destroy (
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     Policy_tie (const Policy_tie &);
     void operator= (const Policy_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+
 #if defined (__ACE_INLINE__)
 #include "PolicyS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "PolicyS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("PolicyS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index 79e549871da..d404b061c43 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -19,6 +19,10 @@
 // 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_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -52,7 +56,10 @@ POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA:
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::~Policy_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -64,7 +71,11 @@ POA_CORBA::Policy_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -72,7 +83,11 @@ POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -93,14 +108,18 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -108,13 +127,15 @@ CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
   ))
 {
   return this->ptr_->policy_type (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -122,13 +143,15 @@ template <class T> ACE_INLINE
   ))
 {
   return this->ptr_->copy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_CORBA::Policy_tie<T>::destroy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -136,7 +159,7 @@ void POA_CORBA::Policy_tie<T>::destroy  (
   ))
 {
   this->ptr_->destroy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 8594f47e06e..408b4ca814a 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -9,7 +9,7 @@
  * PortableServerC.{h,i,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *     -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="tao/corbafwd.h" \
  *          -Wb,pre_include="ace/pre.h" \
@@ -46,265 +46,358 @@
 
 #include <orb.idl>
 #include <Current.pidl>
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
-module PortableServer {
-#   pragma version PortableServer 2.3
-
-    local interface POA;                          // forward declaration
-    typedef sequence<POA> POAList;
-    native Servant;
-    typedef sequence<octet> ObjectId;
-    exception ForwardRequest {
-        Object forward_reference;
+module PortableServer 
+{
+# pragma version PortableServer 2.3
+
+  local interface POA;	    // forward declaration
+  typedef sequence<POA> POAList;
+  native Servant;
+  typedef sequence<octet> ObjectId;
+
+  exception ForwardRequest 
+  {
+    Object forward_reference;
+  };
+
+  // @@ Frank - MIOP specific types
+
+  exception NotAGroupObject {};
+  typedef sequence <ObjectId> IDs;
+
+  // @@ Frank - End MIOP
+
+  // Policy interfaces.
+
+  const CORBA::PolicyType THREAD_POLICY_ID                = 16;
+  const CORBA::PolicyType LIFESPAN_POLICY_ID              = 17;
+  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID         = 18;
+  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID         = 19;
+  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID   = 20;
+  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
+  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
+
+  enum ThreadPolicyValue 
+  {
+    ORB_CTRL_MODEL,
+    SINGLE_THREAD_MODEL
+  };
+
+  local interface ThreadPolicy : CORBA::Policy 
+  {
+    readonly attribute ThreadPolicyValue value;
+  };
+
+  enum LifespanPolicyValue 
+  {
+    TRANSIENT,
+    PERSISTENT
+  };
+
+  local interface LifespanPolicy : CORBA::Policy 
+  {
+    readonly attribute LifespanPolicyValue value;
+  };
+
+  enum IdUniquenessPolicyValue 
+  {
+    UNIQUE_ID,
+    MULTIPLE_ID
+  };
+
+  local interface IdUniquenessPolicy : CORBA::Policy 
+  {
+    readonly attribute IdUniquenessPolicyValue value;
+  };
+
+  enum IdAssignmentPolicyValue 
+  {
+    USER_ID,
+    SYSTEM_ID
+  };
+
+  local interface IdAssignmentPolicy : CORBA::Policy 
+  {
+    readonly attribute IdAssignmentPolicyValue value;
+  };
+
+  enum ImplicitActivationPolicyValue 
+  {
+    IMPLICIT_ACTIVATION,
+    NO_IMPLICIT_ACTIVATION
+  };
+
+  local interface ImplicitActivationPolicy : CORBA::Policy 
+  {
+    readonly attribute ImplicitActivationPolicyValue value;
+  };
+
+  enum ServantRetentionPolicyValue 
+  {
+    RETAIN,
+    NON_RETAIN
+  };
+
+  local interface ServantRetentionPolicy : CORBA::Policy 
+  {
+    readonly attribute ServantRetentionPolicyValue value;
+  };
+
+  enum RequestProcessingPolicyValue 
+  {
+    USE_ACTIVE_OBJECT_MAP_ONLY,
+    USE_DEFAULT_SERVANT,
+    USE_SERVANT_MANAGER
+  };
+
+  local interface RequestProcessingPolicy : CORBA::Policy 
+  {
+    readonly attribute RequestProcessingPolicyValue value;
+  };
+
+  // POAManager interface
+  local interface POAManager 
+  {
+    exception AdapterInactive {};
+
+    enum State 
+    {
+      HOLDING, 
+      ACTIVE, 
+      DISCARDING, 
+      INACTIVE
     };
 
-    // @@ Frank - MIOP specific types
+    void activate ()             
+      raises(AdapterInactive);
+
+    void hold_requests (in boolean wait_for_completion)
+      raises(AdapterInactive);
 
-    exception NotAGroupObject {};
-    typedef sequence <ObjectId> IDs;
+    void discard_requests (in boolean wait_for_completion)
+      raises(AdapterInactive);
 
-    // @@ Frank - End MIOP
+    void deactivate (in boolean etherealize_objects,
+                     in boolean wait_for_completion)
+      raises(AdapterInactive);
 
-    // Policy interfaces
-    const CORBA::PolicyType THREAD_POLICY_ID                = 16;
-    const CORBA::PolicyType LIFESPAN_POLICY_ID              = 17;
-    const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID         = 18;
-    const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID         = 19;
-    const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID   = 20;
-    const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
-    const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
-
-    enum ThreadPolicyValue {
-        ORB_CTRL_MODEL,
-        SINGLE_THREAD_MODEL
-    };
-    local interface ThreadPolicy : CORBA::Policy {
-        readonly attribute ThreadPolicyValue value;
-    };
+    State get_state ();
+  };
 
-    enum LifespanPolicyValue {
-        TRANSIENT,
-        PERSISTENT
-    };
-    local interface LifespanPolicy : CORBA::Policy {
-        readonly attribute LifespanPolicyValue value;
-    };
+  // AdapterActivator interface.
+  local interface AdapterActivator 
+  {
+#   pragma version AdapterActivator 2.3
 
-    enum IdUniquenessPolicyValue {
-        UNIQUE_ID,
-        MULTIPLE_ID
-    };
-    local interface IdUniquenessPolicy : CORBA::Policy {
-        readonly attribute IdUniquenessPolicyValue value;
-    };
+    boolean unknown_adapter (in POA parent,
+                             in string name);
+  };
+
+  // ServantManager interface.
+  local interface ServantManager {};
+
+  local interface ServantActivator : ServantManager 
+  {
+#   pragma version ServantActivator 2.3
 
-    enum IdAssignmentPolicyValue {
-        USER_ID,
-        SYSTEM_ID
-    };
-    local interface IdAssignmentPolicy : CORBA::Policy {
-        readonly attribute IdAssignmentPolicyValue value;
-    };
+    Servant incarnate (in ObjectId oid,
+                       in POA adapter)
+      raises (ForwardRequest);
 
-    enum ImplicitActivationPolicyValue {
-        IMPLICIT_ACTIVATION,
-        NO_IMPLICIT_ACTIVATION
-    };
-    local interface ImplicitActivationPolicy : CORBA::Policy {
-        readonly attribute ImplicitActivationPolicyValue value;
-    };
+    void etherealize (in ObjectId oid,
+                      in POA adapter,
+                      in Servant serv,
+                      in boolean cleanup_in_progress,
+                      in boolean remaining_activations);
+  };
 
-    enum ServantRetentionPolicyValue {
-        RETAIN,
-        NON_RETAIN
-    };
-    local interface ServantRetentionPolicy : CORBA::Policy {
-        readonly attribute ServantRetentionPolicyValue value;
-    };
+  local interface ServantLocator : ServantManager 
+  {
+#   pragma version ServantLocator 2.3
 
-    enum RequestProcessingPolicyValue {
-        USE_ACTIVE_OBJECT_MAP_ONLY,
-        USE_DEFAULT_SERVANT,
-        USE_SERVANT_MANAGER
-    };
-    local interface RequestProcessingPolicy : CORBA::Policy {
-        readonly attribute RequestProcessingPolicyValue value;
-    };
+    native Cookie;
 
-    // POAManager interface
-    local interface POAManager {
-        exception AdapterInactive{};
-        enum State {HOLDING, ACTIVE, DISCARDING, INACTIVE};
-        void activate()             raises(AdapterInactive);
-        void hold_requests(     in boolean wait_for_completion)
-                                    raises(AdapterInactive);
-        void discard_requests(  in boolean wait_for_completion)
-                                    raises(AdapterInactive);
-        void deactivate(        in boolean etherealize_objects,
-                                in boolean wait_for_completion)
-                                    raises(AdapterInactive);
-        State get_state();
-    };
+    Servant preinvoke (in ObjectId oid,
+                       in POA adapter,
+                       in CORBA::Identifier operation,
+                       out Cookie the_cookie)
+      raises (ForwardRequest);
 
-    // AdapterActivator interface
-    local interface AdapterActivator {
-#       pragma version AdapterActivator 2.3
-        boolean unknown_adapter(in POA parent,
-                                in string name);
-    };
+    void postinvoke (in ObjectId oid,
+                     in POA adapter,
+                     in CORBA::Identifier operation,
+                     in Cookie  the_cookie,
+                     in Servant the_servant);
+  };
 
-    // ServantManager interface
-    local interface ServantManager{ };
-
-    local interface ServantActivator : ServantManager {
-#       pragma version ServantActivator 2.3
-        Servant incarnate (     in ObjectId oid,
-                                in POA      adapter)
-                                    raises (ForwardRequest);
-        void etherealize (      in ObjectId oid,
-                                in POA      adapter,
-                                in Servant  serv,
-                                in boolean  cleanup_in_progress,
-                                in boolean  remaining_activations);
-    };
+  local interface POA 
+  {
+#   pragma version POA 2.3
 
-    local interface ServantLocator : ServantManager {
-#       pragma version ServantLocator 2.3
-        native  Cookie;
-        Servant preinvoke(      in ObjectId oid,
-                                in POA      adapter,
-                                in CORBA::Identifier
-                                            operation,
-                                out Cookie  the_cookie)
-                                    raises (ForwardRequest);
-        void postinvoke(        in ObjectId oid,
-                                in POA      adapter,
-                                in CORBA::Identifier
-                                            operation,
-                                in Cookie   the_cookie,
-                                in Servant  the_servant );
-    };
+    exception AdapterAlreadyExists {};
+    exception AdapterNonExistent {};
+    exception InvalidPolicy {unsigned short index;};
+    exception NoServant {};
+    exception ObjectAlreadyActive {};
+    exception ObjectNotActive {};
+    exception ServantAlreadyActive {};
+    exception ServantNotActive {};
+    exception WrongAdapter {};
+    exception WrongPolicy {};
 
-    local interface POA {
-#       pragma version POA 2.3
-        exception AdapterAlreadyExists {};
-        exception AdapterNonExistent {};
-        exception InvalidPolicy {unsigned short index;};
-        exception NoServant {};
-        exception ObjectAlreadyActive {};
-        exception ObjectNotActive {};
-        exception ServantAlreadyActive {};
-        exception ServantNotActive {};
-        exception WrongAdapter {};
-        exception WrongPolicy {};
-
-        // POA creation and destruction
-        POA create_POA(         in string       adapter_name,
-                                in POAManager   a_POAManager,
-                                in CORBA::PolicyList policies)
-                                    raises (AdapterAlreadyExists, InvalidPolicy);
-        POA find_POA(           in string       adapter_name,
-                                in boolean      activate_it)
-                                    raises (AdapterNonExistent);
-        void destroy(           in boolean      etherealize_objects,
-                                in boolean      wait_for_completion);
-
-        // Factories for Policy objects
-        ThreadPolicy        create_thread_policy(in ThreadPolicyValue value);
-        LifespanPolicy
-            create_lifespan_policy(in LifespanPolicyValue value);
-        IdUniquenessPolicy  create_id_uniqueness_policy(
-                                in IdUniquenessPolicyValue value);
-        IdAssignmentPolicy  create_id_assignment_policy(
-                                in IdAssignmentPolicyValue value);
-        ImplicitActivationPolicy create_implicit_activation_policy(
-                                in ImplicitActivationPolicyValue value);
-        ServantRetentionPolicy create_servant_retention_policy(
-                                in ServantRetentionPolicyValue value);
-        RequestProcessingPolicy create_request_processing_policy(
-                                in RequestProcessingPolicyValue value);
-
-        // POA attributes
-        readonly attribute string       the_name;
-        readonly attribute POA          the_parent;
-        readonly attribute POAList      the_children;
-        readonly attribute POAManager   the_POAManager;
-        attribute AdapterActivator      the_activator;
-
-        // Servant Manager registration:
-        ServantManager  get_servant_manager()
-                                    raises (WrongPolicy);
-        void            set_servant_manager(in      ServantManager imgr)
-                                    raises (WrongPolicy);
-
-        // operations for the USE_DEFAULT_SERVANT policy
-        Servant         get_servant() raises (NoServant, WrongPolicy);
-        void            set_servant( in Servant      p_servant)
-                                    raises (WrongPolicy);
-
-        // object activation and deactivation
-        ObjectId        activate_object(in Servant p_servant)
-                                    raises (ServantAlreadyActive, WrongPolicy);
-        void activate_object_with_id(in ObjectId    id,
-                                     in Servant     p_servant)
-                                    raises (ServantAlreadyActive,
-                                            ObjectAlreadyActive,
-                                            WrongPolicy);
-        void deactivate_object(      in ObjectId oid)
-                                    raises (ObjectNotActive, WrongPolicy);
-
-        // reference creation operations
-        Object create_reference (    in CORBA::RepositoryId intf)
-                                    raises (WrongPolicy);
-        Object create_reference_with_id (
-                                    in ObjectId             oid,
-                                    in CORBA::RepositoryId  intf)
-                                    raises (WrongPolicy);
-
-        // Identity mapping operations:
-        ObjectId servant_to_id(     in Servant              p_servant)
-                                    raises (ServantNotActive, WrongPolicy);
-        Object servant_to_reference(in Servant              p_servant)
-                                    raises (ServantNotActive, WrongPolicy);
-        Servant reference_to_servant(in Object              reference)
-                                    raises(ObjectNotActive, WrongAdapter, WrongPolicy);
-        ObjectId reference_to_id(   in Object               reference)
-                                    raises (WrongAdapter, WrongPolicy);
-        Servant id_to_servant(      in ObjectId             oid)
-                                    raises (ObjectNotActive, WrongPolicy);
-        Object id_to_reference(     in ObjectId             oid)
-                                        raises (ObjectNotActive, WrongPolicy);
-
-        readonly attribute CORBA::OctetSeq id;
-
-        // @@ Frank - MIOP specific methods
-
-        ObjectId create_id_for_reference(in Object the_ref)
-                              raises (NotAGroupObject);
-
-        IDs reference_to_ids(in Object the_ref)
-                              raises (NotAGroupObject);
-
-        void associate_reference_with_id (in Object ref,
-                                          in ObjectId oid)
-                              raises (NotAGroupObject);
-
-        void disassociate_reference_with_id (in Object ref,
-                                             in ObjectId oid)
-                              raises (NotAGroupObject);
-
-        // @@ Frank - End MIOP
-    };
+    // POA creation and destruction.
 
-    // Current interface
-    local interface Current : CORBA::Current {
-#       pragma version Current 2.3
-        exception   NoContext { };
-        POA         get_POA()       raises (NoContext);
-        ObjectId    get_object_id() raises (NoContext);
-    };
+    POA create_POA (in string adapter_name,
+                    in POAManager a_POAManager,
+                    in CORBA::PolicyList policies)
+      raises (AdapterAlreadyExists, 
+	      InvalidPolicy);
+
+    POA find_POA (in string adapter_name,
+                  in boolean activate_it)
+      raises (AdapterNonExistent);
+
+    void destroy (in boolean etherealize_objects,
+                  in boolean wait_for_completion);
+
+    // Factories for Policy objects.
+
+    ThreadPolicy create_thread_policy (in ThreadPolicyValue value);
+
+    LifespanPolicy create_lifespan_policy (
+	in LifespanPolicyValue value
+      );
+
+    IdUniquenessPolicy  create_id_uniqueness_policy (
+        in IdUniquenessPolicyValue value
+      );
+
+    IdAssignmentPolicy  create_id_assignment_policy (
+        in IdAssignmentPolicyValue value
+      );
+
+    ImplicitActivationPolicy create_implicit_activation_policy (
+        in ImplicitActivationPolicyValue value\
+      );
+
+    ServantRetentionPolicy create_servant_retention_policy (
+        in ServantRetentionPolicyValue value
+      );
+
+    RequestProcessingPolicy create_request_processing_policy (
+	in RequestProcessingPolicyValue value
+      );
+
+    // POA attributes
+    readonly attribute string       the_name;
+    readonly attribute POA          the_parent;
+    readonly attribute POAList      the_children;
+    readonly attribute POAManager   the_POAManager;
+    attribute AdapterActivator      the_activator;
+
+    // Servant Manager registration:
+
+    ServantManager get_servant_manager ()
+      raises (WrongPolicy);
+
+    void set_servant_manager (in ServantManager imgr)
+      raises (WrongPolicy);
+
+    // Operations for the USE_DEFAULT_SERVANT policy.
+
+    Servant get_servant () 
+      raises (NoServant, 
+	      WrongPolicy);
+
+    void set_servant (in Servant p_servant)
+      raises (WrongPolicy);
+
+    // Object activation and deactivation.
+
+    ObjectId  activate_object (in Servant p_servant)
+      raises (ServantAlreadyActive, 
+	      WrongPolicy);
+
+    void activate_object_with_id (in ObjectId id,
+                                  in Servant p_servant)
+      raises (ServantAlreadyActive,
+	      ObjectAlreadyActive,
+	      WrongPolicy);
+
+    void deactivate_object (in ObjectId oid)
+      raises (ObjectNotActive, WrongPolicy);
+
+    // Reference creation operations.
+
+    Object create_reference (in CORBA::RepositoryId intf)
+      raises (WrongPolicy);
+
+    Object create_reference_with_id (in ObjectId oid,
+				     in CORBA::RepositoryId intf)
+      raises (WrongPolicy);
+
+    // Identity mapping operations:.
+    ObjectId servant_to_id (in Servant p_servant)
+      raises (ServantNotActive, 
+	      WrongPolicy);
+
+    Object servant_to_reference (in Servant p_servant)
+      raises (ServantNotActive, WrongPolicy);
+
+    Servant reference_to_servant (in Object reference)
+      raises (ObjectNotActive, 
+	      WrongAdapter, 
+	      WrongPolicy);
+
+    ObjectId reference_to_id (in Object reference)
+      raises (WrongAdapter, 
+	      WrongPolicy);
+
+    Servant id_to_servant (in ObjectId oid)
+      raises (ObjectNotActive, WrongPolicy);
+
+    Object id_to_reference (in ObjectId oid)
+      raises (ObjectNotActive, 
+	      WrongPolicy);
+
+    readonly attribute CORBA::OctetSeq id;
+
+    // @@ Frank - MIOP specific methods
+
+    ObjectId create_id_for_reference(in Object the_ref)
+      raises (NotAGroupObject);
+
+    IDs reference_to_ids(in Object the_ref)
+      raises (NotAGroupObject);
+
+    void associate_reference_with_id (in Object ref,
+                                      in ObjectId oid)
+      raises (NotAGroupObject);
+
+    void disassociate_reference_with_id (in Object ref,
+                                         in ObjectId oid)
+      raises (NotAGroupObject);
+
+    // @@ Frank - End MIOP
+  };
+
+  // Current interface.
+  local interface Current : CORBA::Current 
+  {
+#   pragma version Current 2.3
+
+    exception NoContext {};
+
+    POA get_POA ()       
+      raises (NoContext);
+
+    ObjectId get_object_id () 
+      raises (NoContext);
+  };
 };
 
 #endif // _PORTABLESERVER_IDL_
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 205005ecc13..3e7d4721917 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PortableServerC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
+
+#include "PortableServerC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -65,6 +68,9 @@ PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
   return TAO_POA::wstring_to_ObjectId (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_)
@@ -76,27 +82,29 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_allocate
 {
   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;
-      }
-  }
+    {
+      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;
 }
 
@@ -104,15 +112,18 @@ void
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      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;
 }
@@ -126,7 +137,7 @@ 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]);
@@ -134,7 +145,7 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_b
     }
 }
 
-void
+void 
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
     void* target,
     CORBA_Object *src
@@ -155,123 +166,220 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_upcast (
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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
 // *************************************************************
 
 PortableServer::POAList::POAList (void)
 {}
-PortableServer::POAList::POAList (CORBA::ULong max) // uses max size
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableServer::POAList::POAList (CORBA::ULong max, CORBA::ULong length, PortableServer::POA_ptr *buffer, CORBA::Boolean release)
-  :
+
+PortableServer::POAList::POAList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableServer::POAList::POAList (const POAList &seq) // copy ctor
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableServer::POAList::~POAList (void) // dtor
 {}
+
 void PortableServer::POAList::_tao_any_destructor (void *_tao_void_pointer)
 {
   POAList *tmp = ACE_static_cast (POAList*, _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_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
+      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) // uses max size
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableServer::ObjectId::ObjectId (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableServer::ObjectId::ObjectId (const ObjectId &seq) // copy ctor
-  :
+
+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>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableServer::ObjectId::~ObjectId (void) // dtor
 {}
+
 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
+    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 (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0
-  9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
+  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
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -290,26 +398,30 @@ static CORBA::TypeCode _tc_TAO_tc_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_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectId,
+    &_tc_TAO_tc_PortableServer_ObjectId
+  )
 TAO_NAMESPACE_END
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-// Default constructor.
+// 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:1.0",
+        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
         "ForwardRequest"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::ForwardRequest::~ForwardRequest (void)
 {
 }
 
-// Copy constructor.
 PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -319,7 +431,6 @@ PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardR
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
 }
 
-// Assignment operator.
 PortableServer::ForwardRequest&
 PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
 {
@@ -335,11 +446,11 @@ void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointe
 }
 
 PortableServer::ForwardRequest *
-PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc)
+PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ForwardRequest *, exc);
+      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
     }
   else
     {
@@ -360,13 +471,13 @@ PortableServer::ForwardRequest::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::ForwardRequest (*this),
+      ::PortableServer::ForwardRequest (*this),
       0
     );
   return result;
 }
 
-void PortableServer::ForwardRequest::_raise ()
+void PortableServer::ForwardRequest::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -380,7 +491,7 @@ void PortableServer::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -393,66 +504,63 @@ void PortableServer::ForwardRequest::_tao_decode (
     {
       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:1.0",
+  )  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
         "ForwardRequest"
       )
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
+{
+  return ::PortableServer::_tc_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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 (0x743a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:1.0
-  15,
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
+  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 (0x73740000),  // name = ForwardRequest
   1, // member count
-  18,
-  ACE_NTOHL (0x666f7277),
-  ACE_NTOHL (0x6172645f),
-  ACE_NTOHL (0x72656665),
-  ACE_NTOHL (0x72656e63),
+    18,
+  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,
@@ -464,35 +572,32 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableServer_ForwardRequest)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ForwardRequest,
+    &_tc_TAO_tc_PortableServer_ForwardRequest
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
-{
-  return ::PortableServer::_tc_ForwardRequest;
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::NotAGroupObject::NotAGroupObject (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/NotAGroupObject:1.0",
+        "IDL:omg.org/PortableServer/NotAGroupObject:2.3",
         "NotAGroupObject"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::NotAGroupObject::~NotAGroupObject (void)
 {
 }
 
-// Copy constructor.
 PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -501,7 +606,6 @@ PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGr
 {
 }
 
-// Assignment operator.
 PortableServer::NotAGroupObject&
 PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObject &_tao_excp)
 {
@@ -516,11 +620,11 @@ void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_point
 }
 
 PortableServer::NotAGroupObject *
-PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc)
+PortableServer::NotAGroupObject::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NotAGroupObject *, exc);
+      return ACE_dynamic_cast (NotAGroupObject *, _tao_excp);
     }
   else
     {
@@ -541,13 +645,13 @@ PortableServer::NotAGroupObject::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::NotAGroupObject (*this),
+      ::PortableServer::NotAGroupObject (*this),
       0
     );
   return result;
 }
 
-void PortableServer::NotAGroupObject::_raise ()
+void PortableServer::NotAGroupObject::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -561,7 +665,7 @@ void PortableServer::NotAGroupObject::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -574,33 +678,42 @@ void PortableServer::NotAGroupObject::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const
+{
+  return ::PortableServer::_tc_NotAGroupObject;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_NotAGroupObject[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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 (0x63743a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/NotAGroupObject:1.0
-  16,
-  ACE_NTOHL (0x4e6f7441),
-  ACE_NTOHL (0x47726f75),
-  ACE_NTOHL (0x704f626a),
+  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 (0x65637400),  // name = NotAGroupObject
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
     CORBA::tk_except,
@@ -612,16 +725,15 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NotAGroupObject, &_tc_TAO_tc_PortableServer_NotAGroupObject)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NotAGroupObject,
+    &_tc_TAO_tc_PortableServer_NotAGroupObject
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const
-{
-  return ::PortableServer::_tc_NotAGroupObject;
-}
-
+// 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)
 
@@ -633,18 +745,23 @@ PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_allocate_buffer (CO
 {
   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);
-
-  }
+    {
+      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;
 }
 
@@ -652,109 +769,130 @@ 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_);
-
+    {
+      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) // Dtor.
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::~_TAO_Unbounded_Sequence_PortableServer_IDs (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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
 // *************************************************************
 
 PortableServer::IDs::IDs (void)
 {}
-PortableServer::IDs::IDs (CORBA::ULong max) // uses max size
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableServer::IDs::IDs (CORBA::ULong max, CORBA::ULong length, PortableServer::ObjectId *buffer, CORBA::Boolean release)
-  :
+
+PortableServer::IDs::IDs (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableServer::IDs::IDs (const IDs &seq) // copy ctor
-  :
+
+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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableServer::IDs::~IDs (void) // dtor
 {}
+
 void PortableServer::IDs::_tao_any_destructor (void *_tao_void_pointer)
 {
   IDs *tmp = ACE_static_cast (IDs*, _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_IDs[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    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 (0x44733a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IDs:1.0
-  4,
+  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
+    CORBA::tk_sequence, // typecode kind
   100, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
     84, // 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 (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0
-      9,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63744964),
+      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
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -776,78 +914,56 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IDs (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IDs,
+    &_tc_TAO_tc_PortableServer_IDs
+  )
 TAO_NAMESPACE_END
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LIFESPAN_POLICY_ID, 17U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_UNIQUENESS_POLICY_ID, 18U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_ASSIGNMENT_POLICY_ID, 19U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, IMPLICIT_ACTIVATION_POLICY_ID, 20U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVANT_RETENTION_POLICY_ID, 21U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U)
-TAO_NAMESPACE_END
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 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 (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
     CORBA::tk_enum,
@@ -859,9 +975,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadPolicyValue, &_tc_TAO_tc_PortableServer_ThreadPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadPolicyValue,
+    &_tc_TAO_tc_PortableServer_ThreadPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ThreadPolicy::_tao_class_id = 0;
 
 PortableServer::ThreadPolicy_ptr
@@ -907,13 +1030,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor
+PortableServer::ThreadPolicy_var::ThreadPolicy_var (void)
   : ptr_ (ThreadPolicy::_nil ())
 {}
 
@@ -923,12 +1056,12 @@ PortableServer::ThreadPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p) // copy constructor
+PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ThreadPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void) // destructor
+PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -957,7 +1090,7 @@ PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_
   return this->ptr_;
 }
 
-PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast
+PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1032,10 +1165,11 @@ PortableServer::ThreadPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ThreadPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
@@ -1044,14 +1178,14 @@ PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
   this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
 }
 
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (const ::PortableServer::ThreadPolicy_out &p)
   : ptr_ (ACE_const_cast (ThreadPolicy_out &, p).ptr_)
 {}
 
@@ -1082,7 +1216,7 @@ PortableServer::ThreadPolicy_out::operator ::PortableServer::ThreadPolicy_ptr &(
 }
 
 ::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_out::ptr (void) // ptr
+PortableServer::ThreadPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1093,9 +1227,8 @@ PortableServer::ThreadPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ThreadPolicy::ThreadPolicy (void)
 {}
@@ -1103,7 +1236,15 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
+void 
+PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ThreadPolicy *tmp = ACE_static_cast (ThreadPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1111,105 +1252,170 @@ PortableServer::ThreadPolicy_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return ThreadPolicy::_nil ();
+    {
+      return ThreadPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ThreadPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ThreadPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ThreadPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ThreadPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
+  return "IDL:omg.org/PortableServer/ThreadPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:2.3
+    13,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ThreadPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ThreadPolicy),
+    (char *) &_oc_PortableServer_ThreadPolicy,
+    0,
+    sizeof (PortableServer::ThreadPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadPolicy,
+    &_tc_TAO_tc_PortableServer_ThreadPolicy
+  )
+TAO_NAMESPACE_END
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 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 (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
     CORBA::tk_enum,
@@ -1221,9 +1427,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_LifespanPolicyValue, &_tc_TAO_tc_PortableServer_LifespanPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_LifespanPolicyValue,
+    &_tc_TAO_tc_PortableServer_LifespanPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::LifespanPolicy::_tao_class_id = 0;
 
 PortableServer::LifespanPolicy_ptr
@@ -1269,13 +1482,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor
+PortableServer::LifespanPolicy_var::LifespanPolicy_var (void)
   : ptr_ (LifespanPolicy::_nil ())
 {}
 
@@ -1285,12 +1508,12 @@ PortableServer::LifespanPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p) // copy constructor
+PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (LifespanPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void) // destructor
+PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1319,7 +1542,7 @@ PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPol
   return this->ptr_;
 }
 
-PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast
+PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1394,10 +1617,11 @@ PortableServer::LifespanPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::LifespanPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
@@ -1406,14 +1630,14 @@ PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
   this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
 }
 
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (const ::PortableServer::LifespanPolicy_out &p)
   : ptr_ (ACE_const_cast (LifespanPolicy_out &, p).ptr_)
 {}
 
@@ -1444,7 +1668,7 @@ PortableServer::LifespanPolicy_out::operator ::PortableServer::LifespanPolicy_pt
 }
 
 ::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_out::ptr (void) // ptr
+PortableServer::LifespanPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1455,9 +1679,8 @@ PortableServer::LifespanPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::LifespanPolicy::LifespanPolicy (void)
 {}
@@ -1465,7 +1688,15 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
+void 
+PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  LifespanPolicy *tmp = ACE_static_cast (LifespanPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1473,105 +1704,171 @@ PortableServer::LifespanPolicy_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return LifespanPolicy::_nil ();
+    {
+      return LifespanPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           LifespanPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &LifespanPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &LifespanPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, LifespanPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
+  return "IDL:omg.org/PortableServer/LifespanPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:2.3
+    15,
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = LifespanPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_LifespanPolicy),
+    (char *) &_oc_PortableServer_LifespanPolicy,
+    0,
+    sizeof (PortableServer::LifespanPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_LifespanPolicy,
+    &_tc_TAO_tc_PortableServer_LifespanPolicy
+  )
+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_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 (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
     CORBA::tk_enum,
@@ -1583,9 +1880,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IdUniquenessPolicyValue, &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdUniquenessPolicyValue,
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::IdUniquenessPolicy::_tao_class_id = 0;
 
 PortableServer::IdUniquenessPolicy_ptr
@@ -1631,13 +1935,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor
+PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void)
   : ptr_ (IdUniquenessPolicy::_nil ())
 {}
 
@@ -1647,12 +1961,12 @@ PortableServer::IdUniquenessPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p) // copy constructor
+PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (IdUniquenessPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void) // destructor
+PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1681,7 +1995,7 @@ PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniqu
   return this->ptr_;
 }
 
-PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
+PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1756,10 +2070,11 @@ PortableServer::IdUniquenessPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::IdUniquenessPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p)
@@ -1768,14 +2083,14 @@ PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPoli
   this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
 }
 
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const ::PortableServer::IdUniquenessPolicy_out &p)
   : ptr_ (ACE_const_cast (IdUniquenessPolicy_out &, p).ptr_)
 {}
 
@@ -1806,7 +2121,7 @@ PortableServer::IdUniquenessPolicy_out::operator ::PortableServer::IdUniquenessP
 }
 
 ::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_out::ptr (void) // ptr
+PortableServer::IdUniquenessPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1817,9 +2132,8 @@ PortableServer::IdUniquenessPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 {}
@@ -1827,7 +2141,15 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
+void 
+PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IdUniquenessPolicy *tmp = ACE_static_cast (IdUniquenessPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1835,104 +2157,172 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr
   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
   )
 {
   if (CORBA::is_nil (obj))
-    return IdUniquenessPolicy::_nil ();
+    {
+      return IdUniquenessPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IdUniquenessPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IdUniquenessPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IdUniquenessPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, IdUniquenessPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
+  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x63790000),  // name = IdUniquenessPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_IdUniquenessPolicy),
+    (char *) &_oc_PortableServer_IdUniquenessPolicy,
+    0,
+    sizeof (PortableServer::IdUniquenessPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdUniquenessPolicy,
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicy
+  )
+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_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 (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
     CORBA::tk_enum,
@@ -1944,9 +2334,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IdAssignmentPolicyValue, &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdAssignmentPolicyValue,
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::IdAssignmentPolicy::_tao_class_id = 0;
 
 PortableServer::IdAssignmentPolicy_ptr
@@ -1992,13 +2389,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor
+PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void)
   : ptr_ (IdAssignmentPolicy::_nil ())
 {}
 
@@ -2008,12 +2415,12 @@ PortableServer::IdAssignmentPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p) // copy constructor
+PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (IdAssignmentPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void) // destructor
+PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2042,7 +2449,7 @@ PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssig
   return this->ptr_;
 }
 
-PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
+PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2117,10 +2524,11 @@ PortableServer::IdAssignmentPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::IdAssignmentPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p)
@@ -2129,14 +2537,14 @@ PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPoli
   this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
 }
 
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const ::PortableServer::IdAssignmentPolicy_out &p)
   : ptr_ (ACE_const_cast (IdAssignmentPolicy_out &, p).ptr_)
 {}
 
@@ -2167,7 +2575,7 @@ PortableServer::IdAssignmentPolicy_out::operator ::PortableServer::IdAssignmentP
 }
 
 ::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_out::ptr (void) // ptr
+PortableServer::IdAssignmentPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2178,9 +2586,8 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 {}
@@ -2188,7 +2595,15 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
+void 
+PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IdAssignmentPolicy *tmp = ACE_static_cast (IdAssignmentPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2196,116 +2611,184 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr
   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
   )
 {
   if (CORBA::is_nil (obj))
-    return IdAssignmentPolicy::_nil ();
+    {
+      return IdAssignmentPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IdAssignmentPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IdAssignmentPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IdAssignmentPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, IdAssignmentPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
+  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x63790000),  // name = IdAssignmentPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_IdAssignmentPolicy),
+    (char *) &_oc_PortableServer_IdAssignmentPolicy,
+    0,
+    sizeof (PortableServer::IdAssignmentPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdAssignmentPolicy,
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicy
+  )
+TAO_NAMESPACE_END
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 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 (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
     CORBA::tk_enum,
@@ -2317,9 +2800,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicyValue, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ImplicitActivationPolicyValue,
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ImplicitActivationPolicy::_tao_class_id = 0;
 
 PortableServer::ImplicitActivationPolicy_ptr
@@ -2365,13 +2855,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor
+PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void)
   : ptr_ (ImplicitActivationPolicy::_nil ())
 {}
 
@@ -2381,12 +2881,12 @@ PortableServer::ImplicitActivationPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
+PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ImplicitActivationPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void) // destructor
+PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2415,7 +2915,7 @@ PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::I
   return this->ptr_;
 }
 
-PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
+PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2490,10 +2990,11 @@ PortableServer::ImplicitActivationPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ImplicitActivationPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p)
@@ -2502,14 +3003,14 @@ PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (Impl
   this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const ::PortableServer::ImplicitActivationPolicy_out &p)
   : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out &, p).ptr_)
 {}
 
@@ -2540,7 +3041,7 @@ PortableServer::ImplicitActivationPolicy_out::operator ::PortableServer::Implici
 }
 
 ::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_out::ptr (void) // ptr
+PortableServer::ImplicitActivationPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2551,9 +3052,8 @@ PortableServer::ImplicitActivationPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 {}
@@ -2561,7 +3061,15 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
+void 
+PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ImplicitActivationPolicy *tmp = ACE_static_cast (ImplicitActivationPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2569,106 +3077,177 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP
   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
   )
 {
   if (CORBA::is_nil (obj))
-    return ImplicitActivationPolicy::_nil ();
+    {
+      return ImplicitActivationPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ImplicitActivationPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ImplicitActivationPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ImplicitActivationPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ImplicitActivationPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
+  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x0),  // name = ImplicitActivationPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ImplicitActivationPolicy),
+    (char *) &_oc_PortableServer_ImplicitActivationPolicy,
+    0,
+    sizeof (PortableServer::ImplicitActivationPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ImplicitActivationPolicy,
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy
+  )
+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_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 (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
     CORBA::tk_enum,
@@ -2680,9 +3259,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServantRetentionPolicyValue, &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantRetentionPolicyValue,
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantRetentionPolicy::_tao_class_id = 0;
 
 PortableServer::ServantRetentionPolicy_ptr
@@ -2728,13 +3314,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor
+PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void)
   : ptr_ (ServantRetentionPolicy::_nil ())
 {}
 
@@ -2744,12 +3340,12 @@ PortableServer::ServantRetentionPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p) // copy constructor
+PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ServantRetentionPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void) // destructor
+PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2778,7 +3374,7 @@ PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::Ser
   return this->ptr_;
 }
 
-PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
+PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2853,10 +3449,11 @@ PortableServer::ServantRetentionPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantRetentionPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p)
@@ -2865,14 +3462,14 @@ PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantR
   this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
 }
 
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const ::PortableServer::ServantRetentionPolicy_out &p)
   : ptr_ (ACE_const_cast (ServantRetentionPolicy_out &, p).ptr_)
 {}
 
@@ -2903,7 +3500,7 @@ PortableServer::ServantRetentionPolicy_out::operator ::PortableServer::ServantRe
 }
 
 ::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_out::ptr (void) // ptr
+PortableServer::ServantRetentionPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2914,9 +3511,8 @@ PortableServer::ServantRetentionPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 {}
@@ -2924,7 +3520,15 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
+void 
+PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantRetentionPolicy *tmp = ACE_static_cast (ServantRetentionPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2932,120 +3536,190 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic
   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
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantRetentionPolicy::_nil ();
+    {
+      return ServantRetentionPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantRetentionPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantRetentionPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantRetentionPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantRetentionPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
+  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x63790000),  // name = ServantRetentionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantRetentionPolicy),
+    (char *) &_oc_PortableServer_ServantRetentionPolicy,
+    0,
+    sizeof (PortableServer::ServantRetentionPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantRetentionPolicy,
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicy
+  )
+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_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 (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:1.0
+  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
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
     CORBA::tk_enum,
@@ -3057,9 +3731,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_RequestProcessingPolicyValue, &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestProcessingPolicyValue,
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::RequestProcessingPolicy::_tao_class_id = 0;
 
 PortableServer::RequestProcessingPolicy_ptr
@@ -3105,13 +3786,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor
+PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void)
   : ptr_ (RequestProcessingPolicy::_nil ())
 {}
 
@@ -3121,12 +3812,12 @@ PortableServer::RequestProcessingPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p) // copy constructor
+PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RequestProcessingPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void) // destructor
+PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3155,7 +3846,7 @@ PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::Re
   return this->ptr_;
 }
 
-PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
+PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3230,10 +3921,11 @@ PortableServer::RequestProcessingPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::RequestProcessingPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p)
@@ -3242,14 +3934,14 @@ PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (Reques
   this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
 }
 
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const ::PortableServer::RequestProcessingPolicy_out &p)
   : ptr_ (ACE_const_cast (RequestProcessingPolicy_out &, p).ptr_)
 {}
 
@@ -3280,7 +3972,7 @@ PortableServer::RequestProcessingPolicy_out::operator ::PortableServer::RequestP
 }
 
 ::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_out::ptr (void) // ptr
+PortableServer::RequestProcessingPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3291,9 +3983,8 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 {}
@@ -3301,7 +3992,15 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
+void 
+PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestProcessingPolicy *tmp = ACE_static_cast (RequestProcessingPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3309,72 +4008,142 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol
   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
   )
 {
   if (CORBA::is_nil (obj))
-    return RequestProcessingPolicy::_nil ();
+    {
+      return RequestProcessingPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           RequestProcessingPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &RequestProcessingPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &RequestProcessingPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, RequestProcessingPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_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;
 }
 
 const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
+  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x69637900),  // name = RequestProcessingPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_RequestProcessingPolicy),
+    (char *) &_oc_PortableServer_RequestProcessingPolicy,
+    0,
+    sizeof (PortableServer::RequestProcessingPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestProcessingPolicy,
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy
+  )
+TAO_NAMESPACE_END
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::POAManager::_tao_class_id = 0;
 
 PortableServer::POAManager_ptr
@@ -3420,13 +4189,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::POAManager_var::POAManager_var (void) // default constructor
+PortableServer::POAManager_var::POAManager_var (void)
   : ptr_ (POAManager::_nil ())
 {}
 
@@ -3436,12 +4215,12 @@ PortableServer::POAManager_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p) // copy constructor
+PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p)
   : TAO_Base_var (),
     ptr_ (POAManager::_duplicate (p.ptr ()))
 {}
 
-PortableServer::POAManager_var::~POAManager_var (void) // destructor
+PortableServer::POAManager_var::~POAManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3470,7 +4249,7 @@ PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr
   return this->ptr_;
 }
 
-PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast
+PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3545,10 +4324,11 @@ PortableServer::POAManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::POAManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
@@ -3557,14 +4337,14 @@ PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
   this->ptr_ = ::PortableServer::POAManager::_nil ();
 }
 
-PortableServer::POAManager_out::POAManager_out (POAManager_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::POAManager_out::POAManager_out (const ::PortableServer::POAManager_out &p)
   : ptr_ (ACE_const_cast (POAManager_out &, p).ptr_)
 {}
 
@@ -3595,7 +4375,7 @@ PortableServer::POAManager_out::operator ::PortableServer::POAManager_ptr &() //
 }
 
 ::PortableServer::POAManager_ptr &
-PortableServer::POAManager_out::ptr (void) // ptr
+PortableServer::POAManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3606,9 +4386,8 @@ PortableServer::POAManager_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::POAManager::POAManager (void)
 {}
@@ -3616,7 +4395,15 @@ PortableServer::POAManager::POAManager (void)
 PortableServer::POAManager::~POAManager (void)
 {}
 
-PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
+void 
+PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POAManager *tmp = ACE_static_cast (POAManager *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::POAManager_ptr
+PortableServer::POAManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3624,73 +4411,91 @@ PortableServer::POAManager_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return POAManager::_nil ();
+    {
+      return POAManager::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           POAManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &POAManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &POAManager::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::POAManager_ptr
 PortableServer::POAManager::_duplicate (POAManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, POAManager)::_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* PortableServer::POAManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/POAManager:1.0";
+  return "IDL:omg.org/PortableServer/POAManager:2.3";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0",
+        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
         "AdapterInactive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -3699,7 +4504,6 @@ PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableSe
 {
 }
 
-// Assignment operator.
 PortableServer::POAManager::AdapterInactive&
 PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
 {
@@ -3707,12 +4511,18 @@ PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::
   return *this;
 }
 
+void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterInactive *tmp = ACE_static_cast (AdapterInactive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POAManager::AdapterInactive *
-PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc)
+PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AdapterInactive *, exc);
+      return ACE_dynamic_cast (AdapterInactive *, _tao_excp);
     }
   else
     {
@@ -3733,13 +4543,13 @@ PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POAManager::AdapterInactive (*this),
+      ::PortableServer::POAManager::AdapterInactive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POAManager::AdapterInactive::_raise ()
+void PortableServer::POAManager::AdapterInactive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -3760,7 +4570,99 @@ void PortableServer::POAManager::AdapterInactive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_type (void) const
+{
+  return ::PortableServer::POAManager::_tc_AdapterInactive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
+    16,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657249), 
+  ACE_NTOHL (0x6e616374), 
+  ACE_NTOHL (0x69766500),  // name = AdapterInactive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POAManager_AdapterInactive),
+    (char *) &_oc_PortableServer_POAManager_AdapterInactive,
+    0,
+    sizeof (PortableServer::POAManager::AdapterInactive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive =
+  &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
+    11,
+  ACE_NTOHL (0x504f414d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65720000),  // name = POAManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_POAManager),
+    (char *) &_oc_PortableServer_POAManager,
+    0,
+    sizeof (PortableServer::POAManager)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_POAManager,
+    &_tc_TAO_tc_PortableServer_POAManager
+  )
+TAO_NAMESPACE_END
+
 #if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::AdapterActivator::_tao_class_id = 0;
 
 PortableServer::AdapterActivator_ptr
@@ -3806,13 +4708,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor
+PortableServer::AdapterActivator_var::AdapterActivator_var (void)
   : ptr_ (AdapterActivator::_nil ())
 {}
 
@@ -3822,12 +4734,12 @@ PortableServer::AdapterActivator_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p) // copy constructor
+PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p)
   : TAO_Base_var (),
     ptr_ (AdapterActivator::_duplicate (p.ptr ()))
 {}
 
-PortableServer::AdapterActivator_var::~AdapterActivator_var (void) // destructor
+PortableServer::AdapterActivator_var::~AdapterActivator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3856,7 +4768,7 @@ PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterAc
   return this->ptr_;
 }
 
-PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast
+PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3931,10 +4843,11 @@ PortableServer::AdapterActivator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::AdapterActivator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p)
@@ -3943,14 +4856,14 @@ PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr
   this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
 }
 
-PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::AdapterActivator_out::AdapterActivator_out (const ::PortableServer::AdapterActivator_out &p)
   : ptr_ (ACE_const_cast (AdapterActivator_out &, p).ptr_)
 {}
 
@@ -3981,7 +4894,7 @@ PortableServer::AdapterActivator_out::operator ::PortableServer::AdapterActivato
 }
 
 ::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_out::ptr (void) // ptr
+PortableServer::AdapterActivator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3992,9 +4905,8 @@ PortableServer::AdapterActivator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::AdapterActivator::AdapterActivator (void)
 {}
@@ -4002,7 +4914,15 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
+void 
+PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterActivator *tmp = ACE_static_cast (AdapterActivator *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4010,50 +4930,68 @@ PortableServer::AdapterActivator_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return AdapterActivator::_nil ();
+    {
+      return AdapterActivator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           AdapterActivator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &AdapterActivator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &AdapterActivator::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, AdapterActivator)::_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;
 }
 
@@ -4062,6 +5000,53 @@ const char* PortableServer::AdapterActivator::_interface_repository_id (void) co
   return "IDL:omg.org/PortableServer/AdapterActivator:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x0),  // name = AdapterActivator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_AdapterActivator),
+    (char *) &_oc_PortableServer_AdapterActivator,
+    0,
+    sizeof (PortableServer::AdapterActivator)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterActivator,
+    &_tc_TAO_tc_PortableServer_AdapterActivator
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantManager::_tao_class_id = 0;
 
 PortableServer::ServantManager_ptr
@@ -4107,13 +5092,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantManager_var::ServantManager_var (void) // default constructor
+PortableServer::ServantManager_var::ServantManager_var (void)
   : ptr_ (ServantManager::_nil ())
 {}
 
@@ -4123,12 +5118,12 @@ PortableServer::ServantManager_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p) // copy constructor
+PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p)
   : TAO_Base_var (),
     ptr_ (ServantManager::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantManager_var::~ServantManager_var (void) // destructor
+PortableServer::ServantManager_var::~ServantManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4157,7 +5152,7 @@ PortableServer::ServantManager_var::operator const ::PortableServer::ServantMana
   return this->ptr_;
 }
 
-PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast
+PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4232,10 +5227,11 @@ PortableServer::ServantManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
@@ -4244,14 +5240,14 @@ PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
   this->ptr_ = ::PortableServer::ServantManager::_nil ();
 }
 
-PortableServer::ServantManager_out::ServantManager_out (ServantManager_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::ServantManager_out::ServantManager_out (const ::PortableServer::ServantManager_out &p)
   : ptr_ (ACE_const_cast (ServantManager_out &, p).ptr_)
 {}
 
@@ -4282,7 +5278,7 @@ PortableServer::ServantManager_out::operator ::PortableServer::ServantManager_pt
 }
 
 ::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_out::ptr (void) // ptr
+PortableServer::ServantManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4293,9 +5289,8 @@ PortableServer::ServantManager_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantManager::ServantManager (void)
 {}
@@ -4303,7 +5298,15 @@ PortableServer::ServantManager::ServantManager (void)
 PortableServer::ServantManager::~ServantManager (void)
 {}
 
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
+void 
+PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantManager *tmp = ACE_static_cast (ServantManager *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantManager_ptr
+PortableServer::ServantManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4311,58 +5314,122 @@ PortableServer::ServantManager_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantManager::_nil ();
+    {
+      return ServantManager::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantManager::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_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* PortableServer::ServantManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantManager:1.0";
+  return "IDL:omg.org/PortableServer/ServantManager:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:2.3
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65720000),  // name = ServantManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantManager),
+    (char *) &_oc_PortableServer_ServantManager,
+    0,
+    sizeof (PortableServer::ServantManager)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantManager,
+    &_tc_TAO_tc_PortableServer_ServantManager
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantActivator::_tao_class_id = 0;
 
 PortableServer::ServantActivator_ptr
@@ -4408,13 +5475,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor
+PortableServer::ServantActivator_var::ServantActivator_var (void)
   : ptr_ (ServantActivator::_nil ())
 {}
 
@@ -4424,12 +5501,12 @@ PortableServer::ServantActivator_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p) // copy constructor
+PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p)
   : TAO_Base_var (),
     ptr_ (ServantActivator::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantActivator_var::~ServantActivator_var (void) // destructor
+PortableServer::ServantActivator_var::~ServantActivator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4458,7 +5535,7 @@ PortableServer::ServantActivator_var::operator const ::PortableServer::ServantAc
   return this->ptr_;
 }
 
-PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast
+PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4533,10 +5610,11 @@ PortableServer::ServantActivator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantActivator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p)
@@ -4545,14 +5623,14 @@ PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr
   this->ptr_ = ::PortableServer::ServantActivator::_nil ();
 }
 
-PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::ServantActivator_out::ServantActivator_out (const ::PortableServer::ServantActivator_out &p)
   : ptr_ (ACE_const_cast (ServantActivator_out &, p).ptr_)
 {}
 
@@ -4583,7 +5661,7 @@ PortableServer::ServantActivator_out::operator ::PortableServer::ServantActivato
 }
 
 ::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_out::ptr (void) // ptr
+PortableServer::ServantActivator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4594,9 +5672,8 @@ PortableServer::ServantActivator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantActivator::ServantActivator (void)
 {}
@@ -4604,7 +5681,15 @@ PortableServer::ServantActivator::ServantActivator (void)
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
+void 
+PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantActivator *tmp = ACE_static_cast (ServantActivator *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4612,62 +5697,82 @@ PortableServer::ServantActivator_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantActivator::_nil ();
+    {
+      return ServantActivator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantActivator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantActivator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantActivator::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableServer::ServantManager_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantActivator)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableServer::ServantManager_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;
 }
 
@@ -4676,6 +5781,53 @@ const char* PortableServer::ServantActivator::_interface_repository_id (void) co
   return "IDL:omg.org/PortableServer/ServantActivator:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x0),  // name = ServantActivator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantActivator),
+    (char *) &_oc_PortableServer_ServantActivator,
+    0,
+    sizeof (PortableServer::ServantActivator)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantActivator,
+    &_tc_TAO_tc_PortableServer_ServantActivator
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantLocator::_tao_class_id = 0;
 
 PortableServer::ServantLocator_ptr
@@ -4721,13 +5873,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor
+PortableServer::ServantLocator_var::ServantLocator_var (void)
   : ptr_ (ServantLocator::_nil ())
 {}
 
@@ -4737,12 +5899,12 @@ PortableServer::ServantLocator_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p) // copy constructor
+PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p)
   : TAO_Base_var (),
     ptr_ (ServantLocator::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantLocator_var::~ServantLocator_var (void) // destructor
+PortableServer::ServantLocator_var::~ServantLocator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4771,7 +5933,7 @@ PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLoca
   return this->ptr_;
 }
 
-PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast
+PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4846,10 +6008,11 @@ PortableServer::ServantLocator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantLocator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
@@ -4858,14 +6021,14 @@ PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
   this->ptr_ = ::PortableServer::ServantLocator::_nil ();
 }
 
-PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::ServantLocator_out::ServantLocator_out (const ::PortableServer::ServantLocator_out &p)
   : ptr_ (ACE_const_cast (ServantLocator_out &, p).ptr_)
 {}
 
@@ -4896,7 +6059,7 @@ PortableServer::ServantLocator_out::operator ::PortableServer::ServantLocator_pt
 }
 
 ::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_out::ptr (void) // ptr
+PortableServer::ServantLocator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4907,9 +6070,8 @@ PortableServer::ServantLocator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantLocator::ServantLocator (void)
 {}
@@ -4917,7 +6079,15 @@ PortableServer::ServantLocator::ServantLocator (void)
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
+void 
+PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantLocator *tmp = ACE_static_cast (ServantLocator *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4925,62 +6095,82 @@ PortableServer::ServantLocator_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantLocator::_nil ();
+    {
+      return ServantLocator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantLocator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantLocator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantLocator::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableServer::ServantManager_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantLocator)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableServer::ServantManager_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;
 }
 
@@ -4989,8 +6179,54 @@ const char* PortableServer::ServantLocator::_interface_repository_id (void) cons
   return "IDL:omg.org/PortableServer/ServantLocator:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:2.3
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744c), 
+  ACE_NTOHL (0x6f636174), 
+  ACE_NTOHL (0x6f720000),  // name = ServantLocator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantLocator),
+    (char *) &_oc_PortableServer_ServantLocator,
+    0,
+    sizeof (PortableServer::ServantLocator)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantLocator,
+    &_tc_TAO_tc_PortableServer_ServantLocator
+  )
+TAO_NAMESPACE_END
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::POA::_tao_class_id = 0;
 
 PortableServer::POA_ptr
@@ -5036,13 +6272,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::POA_var::POA_var (void) // default constructor
+PortableServer::POA_var::POA_var (void)
   : ptr_ (POA::_nil ())
 {}
 
@@ -5052,12 +6298,12 @@ PortableServer::POA_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::POA_var::POA_var (const ::PortableServer::POA_var &p) // copy constructor
+PortableServer::POA_var::POA_var (const ::PortableServer::POA_var &p)
   : TAO_Base_var (),
     ptr_ (POA::_duplicate (p.ptr ()))
 {}
 
-PortableServer::POA_var::~POA_var (void) // destructor
+PortableServer::POA_var::~POA_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -5086,7 +6332,7 @@ PortableServer::POA_var::operator const ::PortableServer::POA_ptr &() const // c
   return this->ptr_;
 }
 
-PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast
+PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -5161,10 +6407,11 @@ PortableServer::POA_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::POA_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::POA_out::POA_out (POA_ptr &p)
@@ -5173,14 +6420,14 @@ PortableServer::POA_out::POA_out (POA_ptr &p)
   this->ptr_ = ::PortableServer::POA::_nil ();
 }
 
-PortableServer::POA_out::POA_out (POA_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::POA_out::POA_out (const ::PortableServer::POA_out &p)
   : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
 {}
 
@@ -5211,7 +6458,7 @@ PortableServer::POA_out::operator ::PortableServer::POA_ptr &() // cast
 }
 
 ::PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
+PortableServer::POA_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -5222,9 +6469,8 @@ PortableServer::POA_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::POA::POA (void)
 {}
@@ -5232,7 +6478,15 @@ PortableServer::POA::POA (void)
 PortableServer::POA::~POA (void)
 {}
 
-PortableServer::POA_ptr PortableServer::POA::_narrow (
+void 
+PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::POA_ptr
+PortableServer::POA::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -5240,50 +6494,68 @@ PortableServer::POA_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return POA::_nil ();
+    {
+      return POA::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           POA_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &POA::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &POA::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::POA_ptr
 PortableServer::POA::_duplicate (POA_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, POA)::_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;
 }
 
@@ -5292,21 +6564,21 @@ const char* PortableServer::POA::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/POA:2.3";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0",
+        "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3",
         "AdapterAlreadyExists"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5315,7 +6587,6 @@ PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::Portabl
 {
 }
 
-// Assignment operator.
 PortableServer::POA::AdapterAlreadyExists&
 PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
 {
@@ -5323,12 +6594,18 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO
   return *this;
 }
 
+void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterAlreadyExists *tmp = ACE_static_cast (AdapterAlreadyExists*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::AdapterAlreadyExists *
-PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc)
+PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AdapterAlreadyExists *, exc);
+      return ACE_dynamic_cast (AdapterAlreadyExists *, _tao_excp);
     }
   else
     {
@@ -5349,13 +6626,13 @@ PortableServer::POA::AdapterAlreadyExists::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::AdapterAlreadyExists (*this),
+      ::PortableServer::POA::AdapterAlreadyExists (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::AdapterAlreadyExists::_raise ()
+void PortableServer::POA::AdapterAlreadyExists::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5376,21 +6653,69 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_type (void) const
+{
+  return ::PortableServer::POA::_tc_AdapterAlreadyExists;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x0),  // name = AdapterAlreadyExists
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
+    (char *) &_oc_PortableServer_POA_AdapterAlreadyExists,
+    0,
+    sizeof (PortableServer::POA::AdapterAlreadyExists)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists =
+  &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0",
+        "IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3",
         "AdapterNonExistent"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5399,7 +6724,6 @@ PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableSer
 {
 }
 
-// Assignment operator.
 PortableServer::POA::AdapterNonExistent&
 PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
 {
@@ -5407,12 +6731,18 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA:
   return *this;
 }
 
+void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterNonExistent *tmp = ACE_static_cast (AdapterNonExistent*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::AdapterNonExistent *
-PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc)
+PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AdapterNonExistent *, exc);
+      return ACE_dynamic_cast (AdapterNonExistent *, _tao_excp);
     }
   else
     {
@@ -5433,13 +6763,13 @@ PortableServer::POA::AdapterNonExistent::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::AdapterNonExistent (*this),
+      ::PortableServer::POA::AdapterNonExistent (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::AdapterNonExistent::_raise ()
+void PortableServer::POA::AdapterNonExistent::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5460,21 +6790,68 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_type (void) const
+{
+  return ::PortableServer::POA::_tc_AdapterNonExistent;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x6e740000),  // name = AdapterNonExistent
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_AdapterNonExistent),
+    (char *) &_oc_PortableServer_POA_AdapterNonExistent,
+    0,
+    sizeof (PortableServer::POA::AdapterNonExistent)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent =
+  &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
+        "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
         "InvalidPolicy"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5484,7 +6861,6 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::
   this->index = _tao_excp.index;
 }
 
-// Assignment operator.
 PortableServer::POA::InvalidPolicy&
 PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
 {
@@ -5493,12 +6869,18 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva
   return *this;
 }
 
+void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidPolicy *tmp = ACE_static_cast (InvalidPolicy*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::InvalidPolicy *
-PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc)
+PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidPolicy *, exc);
+      return ACE_dynamic_cast (InvalidPolicy *, _tao_excp);
     }
   else
     {
@@ -5519,13 +6901,13 @@ PortableServer::POA::InvalidPolicy::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::InvalidPolicy (*this),
+      ::PortableServer::POA::InvalidPolicy (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::InvalidPolicy::_raise ()
+void PortableServer::POA::InvalidPolicy::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5546,34 +6928,88 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableServer::POA::InvalidPolicy::InvalidPolicy (
     CORBA::UShort _tao_index
-  )
-  : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
+  )  : CORBA_UserException (
+        "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
         "InvalidPolicy"
       )
 {
   this->index = _tao_index;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_type (void) const
+{
+  return ::PortableServer::POA::_tc_InvalidPolicy;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
+    14,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x79000000),  // name = InvalidPolicy
+  1, // member count
+    6,
+  ACE_NTOHL (0x696e6465), 
+  ACE_NTOHL (0x78000000),  // name = index
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_InvalidPolicy),
+    (char *) &_oc_PortableServer_POA_InvalidPolicy,
+    0,
+    sizeof (PortableServer::POA::InvalidPolicy)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy =
+  &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::NoServant::NoServant (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/NoServant:1.0",
+        "IDL:omg.org/PortableServer/POA/NoServant:2.3",
         "NoServant"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::NoServant::~NoServant (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5582,7 +7018,6 @@ PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServan
 {
 }
 
-// Assignment operator.
 PortableServer::POA::NoServant&
 PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
 {
@@ -5590,12 +7025,18 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan
   return *this;
 }
 
+void PortableServer::POA::NoServant::_tao_any_destructor (void *_tao_void_pointer)
+{
+  NoServant *tmp = ACE_static_cast (NoServant*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::NoServant *
-PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc)
+PortableServer::POA::NoServant::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NoServant *, exc);
+      return ACE_dynamic_cast (NoServant *, _tao_excp);
     }
   else
     {
@@ -5616,13 +7057,13 @@ PortableServer::POA::NoServant::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::NoServant (*this),
+      ::PortableServer::POA::NoServant (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::NoServant::_raise ()
+void PortableServer::POA::NoServant::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5643,23 +7084,66 @@ void PortableServer::POA::NoServant::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::NoServant::_type (void) const
+{
+  return ::PortableServer::POA::_tc_NoServant;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
+    10,
+  ACE_NTOHL (0x4e6f5365), 
+  ACE_NTOHL (0x7276616e), 
+  ACE_NTOHL (0x74000000),  // name = NoServant
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_NoServant),
+    (char *) &_oc_PortableServer_POA_NoServant,
+    0,
+    sizeof (PortableServer::POA::NoServant)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
+  &_tc_TAO_tc_PortableServer_POA_NoServant;
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3",
         "ObjectAlreadyActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5668,7 +7152,6 @@ PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableS
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ObjectAlreadyActive&
 PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
 {
@@ -5676,12 +7159,18 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA
   return *this;
 }
 
+void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectAlreadyActive *tmp = ACE_static_cast (ObjectAlreadyActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ObjectAlreadyActive *
-PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ObjectAlreadyActive *, exc);
+      return ACE_dynamic_cast (ObjectAlreadyActive *, _tao_excp);
     }
   else
     {
@@ -5702,13 +7191,13 @@ PortableServer::POA::ObjectAlreadyActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ObjectAlreadyActive (*this),
+      ::PortableServer::POA::ObjectAlreadyActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ObjectAlreadyActive::_raise ()
+void PortableServer::POA::ObjectAlreadyActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5729,21 +7218,68 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ObjectAlreadyActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x69766500),  // name = ObjectAlreadyActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
+    (char *) &_oc_PortableServer_POA_ObjectAlreadyActive,
+    0,
+    sizeof (PortableServer::POA::ObjectAlreadyActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive =
+  &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3",
         "ObjectNotActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5752,7 +7288,6 @@ PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::P
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ObjectNotActive&
 PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
 {
@@ -5760,12 +7295,18 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob
   return *this;
 }
 
+void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectNotActive *tmp = ACE_static_cast (ObjectNotActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ObjectNotActive *
-PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ObjectNotActive *, exc);
+      return ACE_dynamic_cast (ObjectNotActive *, _tao_excp);
     }
   else
     {
@@ -5786,13 +7327,13 @@ PortableServer::POA::ObjectNotActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ObjectNotActive (*this),
+      ::PortableServer::POA::ObjectNotActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ObjectNotActive::_raise ()
+void PortableServer::POA::ObjectNotActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5813,21 +7354,66 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ObjectNotActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
+    16,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744e6f), 
+  ACE_NTOHL (0x74416374), 
+  ACE_NTOHL (0x69766500),  // name = ObjectNotActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ObjectNotActive),
+    (char *) &_oc_PortableServer_POA_ObjectNotActive,
+    0,
+    sizeof (PortableServer::POA::ObjectNotActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive =
+  &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3",
         "ServantAlreadyActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5836,7 +7422,6 @@ PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::Portabl
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ServantAlreadyActive&
 PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
 {
@@ -5844,12 +7429,18 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO
   return *this;
 }
 
+void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantAlreadyActive *tmp = ACE_static_cast (ServantAlreadyActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ServantAlreadyActive *
-PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ServantAlreadyActive *, exc);
+      return ACE_dynamic_cast (ServantAlreadyActive *, _tao_excp);
     }
   else
     {
@@ -5870,13 +7461,13 @@ PortableServer::POA::ServantAlreadyActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ServantAlreadyActive (*this),
+      ::PortableServer::POA::ServantAlreadyActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ServantAlreadyActive::_raise ()
+void PortableServer::POA::ServantAlreadyActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5897,21 +7488,69 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ServantAlreadyActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x0),  // name = ServantAlreadyActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
+    (char *) &_oc_PortableServer_POA_ServantAlreadyActive,
+    0,
+    sizeof (PortableServer::POA::ServantAlreadyActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive =
+  &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/ServantNotActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ServantNotActive:2.3",
         "ServantNotActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ServantNotActive::~ServantNotActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -5920,7 +7559,6 @@ PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer:
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ServantNotActive&
 PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
 {
@@ -5928,12 +7566,18 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S
   return *this;
 }
 
+void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantNotActive *tmp = ACE_static_cast (ServantNotActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ServantNotActive *
-PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ServantNotActive *, exc);
+      return ACE_dynamic_cast (ServantNotActive *, _tao_excp);
     }
   else
     {
@@ -5954,13 +7598,13 @@ PortableServer::POA::ServantNotActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ServantNotActive (*this),
+      ::PortableServer::POA::ServantNotActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ServantNotActive::_raise ()
+void PortableServer::POA::ServantNotActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5981,21 +7625,67 @@ void PortableServer::POA::ServantNotActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ServantNotActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (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 (0x0),  // name = ServantNotActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ServantNotActive),
+    (char *) &_oc_PortableServer_POA_ServantNotActive,
+    0,
+    sizeof (PortableServer::POA::ServantNotActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive =
+  &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/WrongAdapter:1.0",
+        "IDL:omg.org/PortableServer/POA/WrongAdapter:2.3",
         "WrongAdapter"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::WrongAdapter::~WrongAdapter (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -6004,7 +7694,6 @@ PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::Wr
 {
 }
 
-// Assignment operator.
 PortableServer::POA::WrongAdapter&
 PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
 {
@@ -6012,12 +7701,18 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong
   return *this;
 }
 
+void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *_tao_void_pointer)
+{
+  WrongAdapter *tmp = ACE_static_cast (WrongAdapter*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::WrongAdapter *
-PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc)
+PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (WrongAdapter *, exc);
+      return ACE_dynamic_cast (WrongAdapter *, _tao_excp);
     }
   else
     {
@@ -6038,13 +7733,13 @@ PortableServer::POA::WrongAdapter::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::WrongAdapter (*this),
+      ::PortableServer::POA::WrongAdapter (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::WrongAdapter::_raise ()
+void PortableServer::POA::WrongAdapter::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -6065,21 +7760,65 @@ void PortableServer::POA::WrongAdapter::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_type (void) const
+{
+  return ::PortableServer::POA::_tc_WrongAdapter;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
+    13,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67416461), 
+  ACE_NTOHL (0x70746572), 
+  ACE_NTOHL (0x0),  // name = WrongAdapter
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_WrongAdapter),
+    (char *) &_oc_PortableServer_POA_WrongAdapter,
+    0,
+    sizeof (PortableServer::POA::WrongAdapter)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter =
+  &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/POA/WrongPolicy:1.0",
+        "IDL:omg.org/PortableServer/POA/WrongPolicy:2.3",
         "WrongPolicy"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::WrongPolicy::~WrongPolicy (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -6088,7 +7827,6 @@ PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::Wron
 {
 }
 
-// Assignment operator.
 PortableServer::POA::WrongPolicy&
 PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
 {
@@ -6096,12 +7834,18 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP
   return *this;
 }
 
+void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  WrongPolicy *tmp = ACE_static_cast (WrongPolicy*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::WrongPolicy *
-PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc)
+PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (WrongPolicy *, exc);
+      return ACE_dynamic_cast (WrongPolicy *, _tao_excp);
     }
   else
     {
@@ -6122,13 +7866,13 @@ PortableServer::POA::WrongPolicy::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::WrongPolicy (*this),
+      ::PortableServer::POA::WrongPolicy (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::WrongPolicy::_raise ()
+void PortableServer::POA::WrongPolicy::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -6149,6 +7893,89 @@ void PortableServer::POA::WrongPolicy::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_type (void) const
+{
+  return ::PortableServer::POA::_tc_WrongPolicy;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
+    12,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x69637900),  // name = WrongPolicy
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_WrongPolicy),
+    (char *) &_oc_PortableServer_POA_WrongPolicy,
+    0,
+    sizeof (PortableServer::POA::WrongPolicy)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy =
+  &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
+    4,
+  ACE_NTOHL (0x504f4100),  // name = POA
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_POA),
+    (char *) &_oc_PortableServer_POA,
+    0,
+    sizeof (PortableServer::POA)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_POA,
+    &_tc_TAO_tc_PortableServer_POA
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::Current::_tao_class_id = 0;
 
 PortableServer::Current_ptr
@@ -6194,13 +8021,23 @@ 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
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::Current_var::Current_var (void) // default constructor
+PortableServer::Current_var::Current_var (void)
   : ptr_ (Current::_nil ())
 {}
 
@@ -6210,12 +8047,12 @@ PortableServer::Current_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p) // copy constructor
+PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p)
   : TAO_Base_var (),
     ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-PortableServer::Current_var::~Current_var (void) // destructor
+PortableServer::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -6244,7 +8081,7 @@ PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() co
   return this->ptr_;
 }
 
-PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast
+PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -6319,10 +8156,11 @@ PortableServer::Current_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::Current_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::Current_out::Current_out (Current_ptr &p)
@@ -6331,14 +8169,14 @@ PortableServer::Current_out::Current_out (Current_ptr &p)
   this->ptr_ = ::PortableServer::Current::_nil ();
 }
 
-PortableServer::Current_out::Current_out (Current_var &p) // constructor from _var
+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) // copy constructor
+PortableServer::Current_out::Current_out (const ::PortableServer::Current_out &p)
   : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
@@ -6369,7 +8207,7 @@ PortableServer::Current_out::operator ::PortableServer::Current_ptr &() // cast
 }
 
 ::PortableServer::Current_ptr &
-PortableServer::Current_out::ptr (void) // ptr
+PortableServer::Current_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -6380,9 +8218,8 @@ PortableServer::Current_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::Current::Current (void)
 {}
@@ -6390,7 +8227,15 @@ PortableServer::Current::Current (void)
 PortableServer::Current::~Current (void)
 {}
 
-PortableServer::Current_ptr PortableServer::Current::_narrow (
+void 
+PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::Current_ptr
+PortableServer::Current::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -6398,62 +8243,82 @@ PortableServer::Current_ptr 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
   )
 {
   if (CORBA::is_nil (obj))
-    return Current::_nil ();
+    {
+      return Current::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Current_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Current::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::Current_ptr
 PortableServer::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (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))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_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)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, Current)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Current::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Current_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;
 }
 
@@ -6462,21 +8327,21 @@ const char* PortableServer::Current::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/Current:2.3";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::Current::NoContext::NoContext (void)
   : CORBA_UserException (
-        "IDL:omg.org/PortableServer/Current/NoContext:1.0",
+        "IDL:omg.org/PortableServer/Current/NoContext:2.3",
         "NoContext"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::Current::NoContext::~NoContext (void)
 {
 }
 
-// Copy constructor.
 PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -6485,7 +8350,6 @@ PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::
 {
 }
 
-// Assignment operator.
 PortableServer::Current::NoContext&
 PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
 {
@@ -6493,12 +8357,18 @@ PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::
   return *this;
 }
 
+void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_pointer)
+{
+  NoContext *tmp = ACE_static_cast (NoContext*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc)
+PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NoContext *, exc);
+      return ACE_dynamic_cast (NoContext *, _tao_excp);
     }
   else
     {
@@ -6519,13 +8389,13 @@ PortableServer::Current::NoContext::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::Current::NoContext (*this),
+      ::PortableServer::Current::NoContext (*this),
       0
     );
   return result;
 }
 
-void PortableServer::Current::NoContext::_raise ()
+void PortableServer::Current::NoContext::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -6546,787 +8416,1456 @@ void PortableServer::Current::NoContext::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::Current::NoContext::_type (void) const
+{
+  return ::PortableServer::Current::_tc_NoContext;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
+    10,
+  ACE_NTOHL (0x4e6f436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x74000000),  // name = NoContext
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_Current_NoContext),
+    (char *) &_oc_PortableServer_Current_NoContext,
+    0,
+    sizeof (PortableServer::Current::NoContext)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext =
+  &_tc_TAO_tc_PortableServer_Current_NoContext;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_Current),
+    (char *) &_oc_PortableServer_Current,
+    0,
+    sizeof (PortableServer::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_PortableServer_Current
+  )
+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 PortableServer::ObjectId &_tao_elem
-  ) // copying
+    const PortableServer::POAList &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        PortableServer::_tc_ObjectId,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert_copy (
+      _tao_any,
+      PortableServer::POAList::_tao_any_destructor,
+      PortableServer::_tc_POAList,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ObjectId *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      PortableServer::_tc_ObjectId,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::ObjectId::_tao_any_destructor
+  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert (
+      _tao_any,
+      PortableServer::POAList::_tao_any_destructor,
+      PortableServer::_tc_POAList,
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ObjectId *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::ObjectId*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::POAList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ObjectId *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::POAList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::POAList>::extract (
+        _tao_any,
+        PortableServer::POAList::_tao_any_destructor,
+        PortableServer::_tc_POAList,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
-    if (!result)
-      return 0; // not equivalent
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::ObjectId &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::insert_copy (
+      _tao_any,
+      PortableServer::ObjectId::_tao_any_destructor,
+      PortableServer::_tc_ObjectId,
+      _tao_elem
+    );
+}
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const PortableServer::ObjectId*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      PortableServer::ObjectId *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::ObjectId, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_ObjectId,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableServer::ObjectId::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ObjectId *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::insert (
+      _tao_any,
+      PortableServer::ObjectId::_tao_any_destructor,
+      PortableServer::_tc_ObjectId,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ObjectId *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::ObjectId *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::ObjectId *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::extract (
+        _tao_any,
+        PortableServer::ObjectId::_tao_any_destructor,
+        PortableServer::_tc_ObjectId,
+        _tao_elem
+      );
 }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::ForwardRequest &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert_copy (
+      _tao_any,
+      PortableServer::ForwardRequest::_tao_any_destructor,
       PortableServer::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ForwardRequest *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ForwardRequest *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert (
+      _tao_any,
+      PortableServer::ForwardRequest::_tao_any_destructor,
       PortableServer::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::ForwardRequest::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardRequest *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ForwardRequest *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::ForwardRequest*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::ForwardRequest *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ForwardRequest *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::ForwardRequest *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableServer::ForwardRequest *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::ForwardRequest, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/PortableServer/ForwardRequest:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_ForwardRequest,
-            1,
-            tmp,
-            PortableServer::ForwardRequest::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::extract (
+        _tao_any,
+        PortableServer::ForwardRequest::_tao_any_destructor,
+        PortableServer::_tc_ForwardRequest,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::NotAGroupObject &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::insert_copy (
+      _tao_any,
+      PortableServer::NotAGroupObject::_tao_any_destructor,
       PortableServer::_tc_NotAGroupObject,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::NotAGroupObject *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::NotAGroupObject *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::insert (
+      _tao_any,
+      PortableServer::NotAGroupObject::_tao_any_destructor,
       PortableServer::_tc_NotAGroupObject,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::NotAGroupObject::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::NotAGroupObject *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::NotAGroupObject *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::NotAGroupObject*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::NotAGroupObject *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::NotAGroupObject *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::NotAGroupObject *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::extract (
+        _tao_any,
+        PortableServer::NotAGroupObject::_tao_any_destructor,
+        PortableServer::_tc_NotAGroupObject,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::NotAGroupObject *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableServer::NotAGroupObject *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::NotAGroupObject, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/PortableServer/NotAGroupObject:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_NotAGroupObject,
-            1,
-            tmp,
-            PortableServer::NotAGroupObject::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// 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::IDs &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        PortableServer::_tc_IDs,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<PortableServer::IDs>::insert_copy (
+      _tao_any,
+      PortableServer::IDs::_tao_any_destructor,
+      PortableServer::_tc_IDs,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::IDs *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IDs *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::IDs>::insert (
+      _tao_any,
+      PortableServer::IDs::_tao_any_destructor,
       PortableServer::_tc_IDs,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::IDs::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IDs *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IDs *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::IDs*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::IDs *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::IDs *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::IDs *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const PortableServer::IDs*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      PortableServer::IDs *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::IDs, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_IDs,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableServer::IDs::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::IDs>::extract (
+        _tao_any,
+        PortableServer::IDs::_tao_any_destructor,
+        PortableServer::_tc_IDs,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue _tao_elem)
+// 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,
+    PortableServer::ThreadPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_ThreadPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ThreadPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ThreadPolicy_ptr _tao_objptr =
+    PortableServer::ThreadPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ThreadPolicy>::insert (
+      _tao_any,
+      PortableServer::ThreadPolicy::_tao_any_destructor,
+      PortableServer::_tc_ThreadPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ThreadPolicy>::extract (
+        _tao_any,
+        PortableServer::ThreadPolicy::_tao_any_destructor,
+        PortableServer::_tc_ThreadPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>
+  template class TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::ThreadPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy, PortableServer::ThreadPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ThreadPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem)
+// 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,
+    PortableServer::LifespanPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_LifespanPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_LifespanPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::LifespanPolicy_ptr _tao_objptr =
+    PortableServer::LifespanPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::LifespanPolicy>::insert (
+      _tao_any,
+      PortableServer::LifespanPolicy::_tao_any_destructor,
+      PortableServer::_tc_LifespanPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::LifespanPolicy>::extract (
+        _tao_any,
+        PortableServer::LifespanPolicy::_tao_any_destructor,
+        PortableServer::_tc_LifespanPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>
+  template class TAO_Object_Manager<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::LifespanPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::LifespanPolicy, PortableServer::LifespanPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::IdUniquenessPolicyValue _tao_elem)
+// 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,
+    PortableServer::IdUniquenessPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_IdUniquenessPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUniquenessPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_IdUniquenessPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::IdUniquenessPolicy_ptr _tao_objptr =
+    PortableServer::IdUniquenessPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::insert (
+      _tao_any,
+      PortableServer::IdUniquenessPolicy::_tao_any_destructor,
+      PortableServer::_tc_IdUniquenessPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::extract (
+        _tao_any,
+        PortableServer::IdUniquenessPolicy::_tao_any_destructor,
+        PortableServer::_tc_IdUniquenessPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>
+  template class TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy, PortableServer::IdUniquenessPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::IdAssignmentPolicyValue _tao_elem)
+// 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,
+    PortableServer::IdAssignmentPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_IdAssignmentPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssignmentPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_IdAssignmentPolicyValue,
+        _tao_elem 
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (!result)
-      return 0; // not equivalent
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::IdAssignmentPolicy_ptr _tao_objptr =
+    PortableServer::IdAssignmentPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::insert (
+      _tao_any,
+      PortableServer::IdAssignmentPolicy::_tao_any_destructor,
+      PortableServer::_tc_IdAssignmentPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::extract (
+        _tao_any,
+        PortableServer::IdAssignmentPolicy::_tao_any_destructor,
+        PortableServer::_tc_IdAssignmentPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>
+  template class TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy, PortableServer::IdAssignmentPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem)
+// 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,
+    PortableServer::ImplicitActivationPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_ImplicitActivationPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ImplicitActivationPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ImplicitActivationPolicy_ptr _tao_objptr =
+    PortableServer::ImplicitActivationPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::insert (
+      _tao_any,
+      PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
+      PortableServer::_tc_ImplicitActivationPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::extract (
+        _tao_any,
+        PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
+        PortableServer::_tc_ImplicitActivationPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>
+  template class TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy, PortableServer::ImplicitActivationPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantRetentionPolicyValue _tao_elem)
+// 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,
+    PortableServer::ServantRetentionPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_ServantRetentionPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantRetentionPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ServantRetentionPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ServantRetentionPolicy_ptr _tao_objptr =
+    PortableServer::ServantRetentionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::insert (
+      _tao_any,
+      PortableServer::ServantRetentionPolicy::_tao_any_destructor,
+      PortableServer::_tc_ServantRetentionPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::extract (
+        _tao_any,
+        PortableServer::ServantRetentionPolicy::_tao_any_destructor,
+        PortableServer::_tc_ServantRetentionPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>
+  template class TAO_Object_Manager<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantRetentionPolicy, PortableServer::ServantRetentionPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::RequestProcessingPolicyValue _tao_elem)
+// 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,
+    PortableServer::RequestProcessingPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_RequestProcessingPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestProcessingPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_RequestProcessingPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::RequestProcessingPolicy_ptr _tao_objptr =
+    PortableServer::RequestProcessingPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::insert (
+      _tao_any,
+      PortableServer::RequestProcessingPolicy::_tao_any_destructor,
+      PortableServer::_tc_RequestProcessingPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::extract (
+        _tao_any,
+        PortableServer::RequestProcessingPolicy::_tao_any_destructor,
+        PortableServer::_tc_RequestProcessingPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>
+  template class TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy, PortableServer::RequestProcessingPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr _tao_elem
+  )
+{
+  PortableServer::POAManager_ptr _tao_objptr =
+    PortableServer::POAManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::POAManager>::insert (
+      _tao_any,
+      PortableServer::POAManager::_tao_any_destructor,
+      PortableServer::_tc_POAManager,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::POAManager>::extract (
+        _tao_any,
+        PortableServer::POAManager::_tao_any_destructor,
+        PortableServer::_tc_POAManager,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>
+  template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
+  template class TAO::Any_Impl_T<PortableServer::POAManager>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::POAManager, PortableServer::POAManager_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::POAManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr _tao_elem
+  )
+{
+  PortableServer::AdapterActivator_ptr _tao_objptr =
+    PortableServer::AdapterActivator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::AdapterActivator>::insert (
+      _tao_any,
+      PortableServer::AdapterActivator::_tao_any_destructor,
+      PortableServer::_tc_AdapterActivator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::AdapterActivator>::extract (
+        _tao_any,
+        PortableServer::AdapterActivator::_tao_any_destructor,
+        PortableServer::_tc_AdapterActivator,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>
+  template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
+  template class TAO::Any_Impl_T<PortableServer::AdapterActivator>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator, PortableServer::AdapterActivator_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::AdapterActivator>
 #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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr _tao_elem
+  )
+{
+  PortableServer::ServantManager_ptr _tao_objptr =
+    PortableServer::ServantManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantManager>::insert (
+      _tao_any,
+      PortableServer::ServantManager::_tao_any_destructor,
+      PortableServer::_tc_ServantManager,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantManager>::extract (
+        _tao_any,
+        PortableServer::ServantManager::_tao_any_destructor,
+        PortableServer::_tc_ServantManager,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var>
+  template class TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantManager>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantManager, PortableServer::ServantManager_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantManager>
 #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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr _tao_elem
+  )
+{
+  PortableServer::ServantActivator_ptr _tao_objptr =
+    PortableServer::ServantActivator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
+      _tao_any,
+      PortableServer::ServantActivator::_tao_any_destructor,
+      PortableServer::_tc_ServantActivator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
+        _tao_any,
+        PortableServer::ServantActivator::_tao_any_destructor,
+        PortableServer::_tc_ServantActivator,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var>
+  template class TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantActivator>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator, PortableServer::ServantActivator_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantActivator>
 #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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr _tao_elem
+  )
+{
+  PortableServer::ServantLocator_ptr _tao_objptr =
+    PortableServer::ServantLocator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantLocator>::insert (
+      _tao_any,
+      PortableServer::ServantLocator::_tao_any_destructor,
+      PortableServer::_tc_ServantLocator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantLocator>::extract (
+        _tao_any,
+        PortableServer::ServantLocator::_tao_any_destructor,
+        PortableServer::_tc_ServantLocator,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>
+  template class TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantLocator>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator, PortableServer::ServantLocator_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantLocator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POA_ptr _tao_elem
+  )
+{
+  PortableServer::POA_ptr _tao_objptr =
+    PortableServer::POA::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POA_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::POA>::insert (
+      _tao_any,
+      PortableServer::POA::_tao_any_destructor,
+      PortableServer::_tc_POA,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POA_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::POA>::extract (
+        _tao_any,
+        PortableServer::POA::_tao_any_destructor,
+        PortableServer::_tc_POA,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
+  template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
+  template class TAO::Any_Impl_T<PortableServer::POA>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::POA>
 #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.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::Current_ptr _tao_elem
+  )
+{
+  PortableServer::Current_ptr _tao_objptr =
+    PortableServer::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::Current>::insert (
+      _tao_any,
+      PortableServer::Current::_tao_any_destructor,
+      PortableServer::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::Current>::extract (
+        _tao_any,
+        PortableServer::Current::_tao_any_destructor,
+        PortableServer::_tc_Current,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var>
+  template class TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var>;
+  template class TAO::Any_Impl_T<PortableServer::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::Current, PortableServer::Current_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:64
+
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
+{
+  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 PortableServer::ObjectId &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      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 ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        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 ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -7335,93 +9874,316 @@ CORBA::Boolean operator>> (
   )
 {
   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 1159.)
-    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
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // 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.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        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);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          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);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      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 ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #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
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableServer::IDs &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+      // Encode all elements.
+      }
+    
+  return 0;
 }
-
-CORBA::Boolean operator>> (
+  
+  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 1159.)
-    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_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // 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 _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index d654972f389..721d28e5b64 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -19,6 +19,9 @@
 // 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
+
 #ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
@@ -34,6 +37,7 @@
 #include "tao/Sequence.h"
 #include "tao/Exception.h"
 #include "tao/PolicyC.h"
+#include "tao/OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -65,8 +69,12 @@ class TAO_Local_ServantBase;
 class TAO_DynamicImplementation;
 class TAO_POA;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  PortableServer
 {
+  
   typedef TAO_ServantBase ServantBase;
   typedef TAO_ServantBase_var ServantBase_var;
   typedef TAO_RefCountServantBase RefCountServantBase;
@@ -75,40 +83,45 @@ TAO_NAMESPACE  PortableServer
   typedef TAO_Local_ServantBase LocalServantBase;
   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;
 
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
 #define _PORTABLESERVER_POA___PTR_CH_
-
+  
   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 (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
+    // 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);
@@ -119,7 +132,7 @@ TAO_NAMESPACE  PortableServer
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -127,13 +140,14 @@ TAO_NAMESPACE  PortableServer
     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:
@@ -146,25 +160,25 @@ TAO_NAMESPACE  PortableServer
     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_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_PortableServer_POAList
+  
+  class TAO_PortableServer_Export _TAO_Unbounded_Object_Sequence_PortableServer_POAList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList (
@@ -180,14 +194,14 @@ TAO_NAMESPACE  PortableServer
         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);
@@ -197,7 +211,7 @@ TAO_NAMESPACE  PortableServer
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA_Object *src
@@ -208,56 +222,62 @@ TAO_NAMESPACE  PortableServer
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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
+  
   class POAList;
   class POAList_var;
-
+  
   // *************************************************************
-  // POAList
+  // 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
 
-  class TAO_PortableServer_Export POAList : public
 #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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    POAList (void); // default ctor
-    POAList (CORBA::ULong max); // uses max size
+    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 &); // copy ctor
+    POAList (const POAList &);
     ~POAList (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef POAList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #endif /* end #if !defined */
 
-
 #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:
@@ -265,37 +285,40 @@ TAO_NAMESPACE  PortableServer
     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;
-    operator POAList *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator POAList *&();
+    
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // 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_;
   };
 
-
 #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:
@@ -308,52 +331,60 @@ TAO_NAMESPACE  PortableServer
     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;
-
+  
   // *************************************************************
-  // ObjectId
+  // 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
 
-  class TAO_PortableServer_Export ObjectId : 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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ObjectId (void); // default ctor
-    ObjectId (CORBA::ULong max); // uses max size
+    ObjectId (void);
+    ObjectId (CORBA::ULong max);
     ObjectId (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::Octet *buffer, 
         CORBA::Boolean release = 0
       );
-    ObjectId (const ObjectId &); // copy ctor
+    ObjectId (const ObjectId &);
     ~ObjectId (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef ObjectId_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     ObjectId (
         CORBA::ULong length,
@@ -361,61 +392,66 @@ TAO_NAMESPACE  PortableServer
       )
       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
   };
 
 #endif /* end #if !defined */
 
-
 #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
+    
+    // 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_;
   };
 
-
 #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:
@@ -428,36 +464,41 @@ TAO_NAMESPACE  PortableServer
     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 &);
   };
 
-
 #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
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #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 void _tao_any_destructor (void *);
+    
     static ForwardRequest *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -469,43 +510,54 @@ TAO_NAMESPACE  PortableServer
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-        ForwardRequest (
+    
+    // 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_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
-
+  
+  // 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)
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #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 void _tao_any_destructor (void *);
+    
     static NotAGroupObject *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -517,34 +569,39 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
         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_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
-
+  
+  // 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_EXPORT_MACRO _TAO_Unbounded_Sequence_PortableServer_IDs
+  
+  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_PortableServer_IDs
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_PortableServer_IDs (void);
-    _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_PortableServer_IDs (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -558,15 +615,15 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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);
@@ -582,56 +639,62 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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
+  
   class IDs;
   class IDs_var;
-
+  
   // *************************************************************
-  // IDs
+  // 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
 
-  class TAO_PortableServer_Export IDs : public
 #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 */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    IDs (void); // default ctor
-    IDs (CORBA::ULong max); // uses max size
+    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 &); // copy ctor
+    IDs (const IDs &);
     ~IDs (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef IDs_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #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:
@@ -639,38 +702,41 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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;
-    operator IDs *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator IDs *&();
+    
     ObjectId & operator[] (CORBA::ULong index);
     const ObjectId & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // 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 */
 
-
 #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:
@@ -683,79 +749,113 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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 &);
   };
 
-
 #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_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_UNIQUENESS_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_ASSIGNMENT_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID;
-
+  // 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;
+  
+  // 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;
+  
+  // 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;
+  
+  // 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;
+  
+  // 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;
+  
+  // 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;
+  
+  // 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;
+  
+  // 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
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___PTR_CH_
-
+  
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
 
 #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
   {
   public:
     ThreadPolicy_var (void); // default constructor
-    ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -766,7 +866,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ThreadPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -774,13 +874,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -793,117 +894,137 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ThreadPolicy_ptr &();
     ThreadPolicy_ptr &ptr (void);
     ThreadPolicy_ptr operator-> (void);
-
+  
   private:
     ThreadPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ThreadPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ThreadPolicy_ptr _ptr_type;
     typedef ThreadPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_
-
+  
   class LifespanPolicy;
   typedef LifespanPolicy *LifespanPolicy_ptr;
 
 #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
   {
   public:
     LifespanPolicy_var (void); // default constructor
-    LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -914,7 +1035,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     LifespanPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -922,13 +1043,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -941,115 +1063,135 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator LifespanPolicy_ptr &();
     LifespanPolicy_ptr &ptr (void);
     LifespanPolicy_ptr operator-> (void);
-
+  
   private:
     LifespanPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
-
+  
   class TAO_PortableServer_Export LifespanPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef LifespanPolicy_ptr _ptr_type;
     typedef LifespanPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_
-
+  
   class IdUniquenessPolicy;
   typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
 
 #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
   {
   public:
     IdUniquenessPolicy_var (void); // default constructor
-    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -1060,7 +1202,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IdUniquenessPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1068,13 +1210,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -1087,115 +1230,135 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator IdUniquenessPolicy_ptr &();
     IdUniquenessPolicy_ptr &ptr (void);
     IdUniquenessPolicy_ptr operator-> (void);
-
+  
   private:
     IdUniquenessPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-
+  
   class TAO_PortableServer_Export IdUniquenessPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IdUniquenessPolicy_ptr _ptr_type;
     typedef IdUniquenessPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_
-
+  
   class IdAssignmentPolicy;
   typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
 
 #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
   {
   public:
     IdAssignmentPolicy_var (void); // default constructor
-    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -1206,7 +1369,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IdAssignmentPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1214,13 +1377,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -1233,117 +1397,137 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator IdAssignmentPolicy_ptr &();
     IdAssignmentPolicy_ptr &ptr (void);
     IdAssignmentPolicy_ptr operator-> (void);
-
+  
   private:
     IdAssignmentPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-
+  
   class TAO_PortableServer_Export IdAssignmentPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IdAssignmentPolicy_ptr _ptr_type;
     typedef IdAssignmentPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_
-
+  
   class ImplicitActivationPolicy;
   typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
 
 #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
   {
   public:
     ImplicitActivationPolicy_var (void); // default constructor
-    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -1354,7 +1538,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ImplicitActivationPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1362,13 +1546,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -1381,119 +1566,139 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ImplicitActivationPolicy_ptr &();
     ImplicitActivationPolicy_ptr &ptr (void);
     ImplicitActivationPolicy_ptr operator-> (void);
-
+  
   private:
     ImplicitActivationPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ImplicitActivationPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ImplicitActivationPolicy_ptr _ptr_type;
     typedef ImplicitActivationPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_
-
+  
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
 
 #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
   {
   public:
     ServantRetentionPolicy_var (void); // default constructor
-    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -1504,7 +1709,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantRetentionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1512,13 +1717,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -1531,120 +1737,140 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantRetentionPolicy_ptr &();
     ServantRetentionPolicy_ptr &ptr (void);
     ServantRetentionPolicy_ptr operator-> (void);
-
+  
   private:
     ServantRetentionPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ServantRetentionPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantRetentionPolicy_ptr _ptr_type;
     typedef ServantRetentionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_
-
+  
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
 
 #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
   {
   public:
     RequestProcessingPolicy_var (void); // default constructor
-    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -1655,7 +1881,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestProcessingPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1663,13 +1889,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -1682,107 +1909,121 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator RequestProcessingPolicy_ptr &();
     RequestProcessingPolicy_ptr &ptr (void);
     RequestProcessingPolicy_ptr operator-> (void);
-
+  
   private:
     RequestProcessingPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-
+  
   class TAO_PortableServer_Export RequestProcessingPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RequestProcessingPolicy_ptr _ptr_type;
     typedef RequestProcessingPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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_
-
+  
   class POAManager;
   typedef POAManager *POAManager_ptr;
 
 #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
   {
   public:
     POAManager_var (void); // default constructor
-    POAManager_var (POAManager_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -1793,7 +2034,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POAManager_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1801,13 +2042,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -1820,61 +2062,65 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator POAManager_ptr &();
     POAManager_ptr &ptr (void);
     POAManager_ptr operator-> (void);
-
+  
   private:
     POAManager_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_POAMANAGER_CH_)
 #define _PORTABLESERVER_POAMANAGER_CH_
-
+  
   class TAO_PortableServer_Export POAManager
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef POAManager_ptr _ptr_type;
     typedef POAManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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);
 
@@ -1886,18 +2132,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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,
@@ -1905,19 +2161,30 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
       )
       ACE_THROW_SPEC ((
         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
@@ -1926,7 +2193,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -1935,7 +2205,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -1945,69 +2218,87 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
+    
     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
+
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-
+  
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
 
 #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
   {
   public:
     AdapterActivator_var (void); // default constructor
-    AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -2018,7 +2309,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AdapterActivator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2026,13 +2317,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -2045,47 +2337,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator AdapterActivator_ptr &();
     AdapterActivator_ptr &ptr (void);
     AdapterActivator_ptr operator-> (void);
-
+  
   private:
     AdapterActivator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-
+  
   class TAO_PortableServer_Export AdapterActivator
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef AdapterActivator_ptr _ptr_type;
     typedef AdapterActivator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
@@ -2094,58 +2389,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     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
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_
-
+  
   class ServantManager;
   typedef ServantManager *ServantManager_ptr;
 
 #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
   {
   public:
     ServantManager_var (void); // default constructor
-    ServantManager_var (ServantManager_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -2156,7 +2462,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantManager_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2164,13 +2470,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -2183,98 +2490,109 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantManager_ptr &();
     ServantManager_ptr &ptr (void);
     ServantManager_ptr operator-> (void);
-
+  
   private:
     ServantManager_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER_CH_
-
+  
   class TAO_PortableServer_Export ServantManager
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantManager_ptr _ptr_type;
     typedef ServantManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
+    
     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
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_
-
+  
   class ServantActivator;
   typedef ServantActivator *ServantActivator_ptr;
 
 #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
   {
   public:
     ServantActivator_var (void); // default constructor
-    ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -2285,7 +2603,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantActivator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2293,13 +2611,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -2312,47 +2631,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantActivator_ptr &();
     ServantActivator_ptr &ptr (void);
     ServantActivator_ptr operator-> (void);
-
+  
   private:
     ServantActivator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-
+  
   class TAO_PortableServer_Export ServantActivator
     : public virtual PortableServer::ServantManager
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantActivator_ptr _ptr_type;
     typedef ServantActivator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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
@@ -2368,7 +2690,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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,
@@ -2380,58 +2705,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     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
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_
-
+  
   class ServantLocator;
   typedef ServantLocator *ServantLocator_ptr;
 
 #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
   {
   public:
     ServantLocator_var (void); // default constructor
-    ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -2442,7 +2778,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantLocator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2450,13 +2786,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -2469,50 +2806,52 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantLocator_ptr &();
     ServantLocator_ptr &ptr (void);
     ServantLocator_ptr operator-> (void);
-
+  
   private:
     ServantLocator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR_CH_
-
+  
   class TAO_PortableServer_Export ServantLocator
     : public virtual PortableServer::ServantManager
   {
   public:
-
     typedef void *Cookie;
 
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantLocator_ptr _ptr_type;
     typedef ServantLocator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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,
@@ -2530,7 +2869,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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,
@@ -2542,58 +2884,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     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 (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
+    // 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);
@@ -2604,7 +2957,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2612,13 +2965,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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:
@@ -2631,66 +2985,72 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-
+  
   private:
     POA_ptr &ptr_;
   };
 
-
 #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
+
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
-
+  
   class TAO_PortableServer_Export POA
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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)
+    
+    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);
 
@@ -2702,32 +3062,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -2739,33 +3110,44 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -2777,36 +3159,52 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-            InvalidPolicy (
+      
+      // 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
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #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);
 
@@ -2818,33 +3216,45 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #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);
 
@@ -2856,32 +3266,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -2893,31 +3314,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -2929,32 +3362,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -2966,32 +3410,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -3003,32 +3458,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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);
 
@@ -3040,18 +3506,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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,
@@ -3063,7 +3539,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3073,7 +3552,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3082,9 +3564,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3092,9 +3577,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3102,7 +3590,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3110,7 +3601,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3118,9 +3612,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3128,7 +3625,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3136,7 +3636,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
@@ -3144,50 +3647,64 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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)
-    virtual ::PortableServer::AdapterActivator_ptr the_activator (
 
+    // 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
@@ -3195,16 +3712,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       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
       )
       ACE_THROW_SPEC ((
         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
@@ -3213,9 +3735,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
       )
       ACE_THROW_SPEC ((
@@ -3223,7 +3747,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3232,9 +3759,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3244,7 +3774,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3256,7 +3789,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3266,7 +3802,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3275,7 +3814,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3285,7 +3827,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3295,7 +3840,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3305,7 +3853,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3316,7 +3867,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3326,7 +3880,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3336,7 +3893,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3346,17 +3906,22 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , 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
@@ -3365,7 +3930,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3374,7 +3942,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3384,7 +3955,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
@@ -3394,60 +3968,71 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         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
+    
     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
 
 #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
 #define _PORTABLESERVER_CURRENT___PTR_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
 
 #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
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -3458,7 +4043,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -3466,13 +4051,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     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
   {
   public:
@@ -3485,61 +4071,65 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-
+  
   private:
     Current_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_CURRENT_CH_)
 #define _PORTABLESERVER_CURRENT_CH_
-
+  
   class TAO_PortableServer_Export Current
     : public virtual CORBA::Current
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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);
 
@@ -3551,61 +4141,93 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           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
       )
       ACE_THROW_SPEC ((
         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
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     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);
   TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 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::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 *&);
+
+// 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
@@ -3613,6 +4235,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
@@ -3622,39 +4247,277 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::NotAGroupObject *&);
+
+// 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::IDs &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IDs*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IDs *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicy_ptr &);
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr &);
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAManager::AdapterInactive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::AdapterInactive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::AdapterInactive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAManager::AdapterInactive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::State);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterNonExistent *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::InvalidPolicy *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectNotActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantAlreadyActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantNotActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongAdapter *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// 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_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_PortableServer_ObjectId_H_
 #define _TAO_CDR_OP_PortableServer_ObjectId_H_
@@ -3672,6 +4535,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
@@ -3679,9 +4545,14 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
 
+// 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_IDs_H_
 #define _TAO_CDR_OP_PortableServer_IDs_H_
@@ -3697,31 +4568,61 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_PortableServer_IDs_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.i"
@@ -3737,3 +4638,4 @@ 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 d471a191885..384d237e94f 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -20,31 +20,39 @@
 //     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 **
+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
+ACE_INLINE
+void 
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -60,137 +68,164 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbo
 }
 
 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)
+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)
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
+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 ();
+      return *this;
     }
-    if (this->maximum_ < rhs.maximum_)
+  
+  if (this->release_)
     {
-      _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
+      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_);
-
+    {
+      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_);
-
+  
+  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>
+ACE_INLINE
+TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
+  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* *
+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_);
+      // 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;
+      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* *
+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_);
+  return ACE_reinterpret_cast (const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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) // default constructor
+PortableServer::POAList_var::POAList_var (void)
   : ptr_ (0)
 {}
 
@@ -200,21 +235,26 @@ PortableServer::POAList_var::POAList_var (POAList *p)
 {}
 
 ACE_INLINE
-PortableServer::POAList_var::POAList_var (const ::PortableServer::POAList_var &p) // copy constructor
+PortableServer::POAList_var::POAList_var (const ::PortableServer::POAList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableServer::POAList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableServer::POAList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-PortableServer::POAList_var::~POAList_var (void) // destructor
+PortableServer::POAList_var::~POAList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableServer::POAList_var &
+ACE_INLINE
+PortableServer::POAList_var &
 PortableServer::POAList_var::operator= (POAList *p)
 {
   delete this->ptr_;
@@ -222,7 +262,8 @@ PortableServer::POAList_var::operator= (POAList *p)
   return *this;
 }
 
-ACE_INLINE ::PortableServer::POAList_var &
+ACE_INLINE
+::PortableServer::POAList_var &
 PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
 {
   if (this != &p)
@@ -234,9 +275,13 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
         }
       else
         {
-          POAList *deep_copy =
-            new POAList (*p.ptr_);
-
+          POAList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              POAList (*p.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
               POAList *tmp = deep_copy;
@@ -246,17 +291,19 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::PortableServer::POAList *
+ACE_INLINE
+const ::PortableServer::POAList *
 PortableServer::POAList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_var::operator-> (void)
 {
   return this->ptr_;
@@ -269,44 +316,47 @@ PortableServer::POAList_var::operator const ::PortableServer::POAList &() const
 }
 
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
+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 &
+ACE_INLINE
+const ::PortableServer::POAList &
 PortableServer::POAList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList &
+ACE_INLINE
+::PortableServer::POAList &
 PortableServer::POAList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::PortableServer::POAList *&
+ACE_INLINE
+::PortableServer::POAList *&
 PortableServer::POAList_var::out (void)
 {
   delete this->ptr_;
@@ -314,7 +364,8 @@ PortableServer::POAList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_var::_retn (void)
 {
   ::PortableServer::POAList *tmp = this->ptr_;
@@ -322,12 +373,16 @@ PortableServer::POAList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+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
 // *************************************************************
@@ -340,7 +395,7 @@ PortableServer::POAList_out::POAList_out (POAList *&p)
 }
 
 ACE_INLINE
-PortableServer::POAList_out::POAList_out (POAList_var &p) // constructor from _var
+PortableServer::POAList_out::POAList_out (POAList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -348,18 +403,20 @@ PortableServer::POAList_out::POAList_out (POAList_var &p) // constructor from _v
 }
 
 ACE_INLINE
-PortableServer::POAList_out::POAList_out (const ::PortableServer::POAList_out &p) // copy constructor
+PortableServer::POAList_out::POAList_out (const ::PortableServer::POAList_out &p)
   : ptr_ (ACE_const_cast (POAList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableServer::POAList_out &
+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 &
+ACE_INLINE
+::PortableServer::POAList_out &
 PortableServer::POAList_out::operator= (POAList *p)
 {
   this->ptr_ = p;
@@ -372,37 +429,41 @@ PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *&
+ACE_INLINE
+::PortableServer::POAList *&
 PortableServer::POAList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
+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) // default constructor
+PortableServer::ObjectId_var::ObjectId_var (void)
   : ptr_ (0)
 {}
 
@@ -412,15 +473,19 @@ PortableServer::ObjectId_var::ObjectId_var (ObjectId *p)
 {}
 
 ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId_var &p) // copy constructor
+PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableServer::ObjectId (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableServer::ObjectId (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId &p)
 {
@@ -428,12 +493,13 @@ PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId &p)
 }
 
 ACE_INLINE
-PortableServer::ObjectId_var::~ObjectId_var (void) // destructor
+PortableServer::ObjectId_var::~ObjectId_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableServer::ObjectId_var &
+ACE_INLINE
+PortableServer::ObjectId_var &
 PortableServer::ObjectId_var::operator= (ObjectId *p)
 {
   delete this->ptr_;
@@ -441,7 +507,8 @@ PortableServer::ObjectId_var::operator= (ObjectId *p)
   return *this;
 }
 
-ACE_INLINE ::PortableServer::ObjectId_var &
+ACE_INLINE
+::PortableServer::ObjectId_var &
 PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p)
 {
   if (this != &p)
@@ -453,9 +520,13 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
         }
       else
         {
-          ObjectId *deep_copy =
-            new ObjectId (*p.ptr_);
-
+          ObjectId *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ObjectId (*p.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
               ObjectId *tmp = deep_copy;
@@ -465,29 +536,33 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
             }
         }
     }
-
+  
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::PortableServer::ObjectId_var &
+// 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);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::PortableServer::ObjectId (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::PortableServer::ObjectId *
+ACE_INLINE
+const ::PortableServer::ObjectId *
 PortableServer::ObjectId_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_var::operator-> (void)
 {
   return this->ptr_;
@@ -500,43 +575,47 @@ PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() cons
 }
 
 ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
 PortableServer::ObjectId_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
+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 &
+ACE_INLINE
+const ::PortableServer::ObjectId &
 PortableServer::ObjectId_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId &
+ACE_INLINE
+::PortableServer::ObjectId &
 PortableServer::ObjectId_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::PortableServer::ObjectId *&
+ACE_INLINE
+::PortableServer::ObjectId *&
 PortableServer::ObjectId_var::out (void)
 {
   delete this->ptr_;
@@ -544,7 +623,8 @@ PortableServer::ObjectId_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_var::_retn (void)
 {
   ::PortableServer::ObjectId *tmp = this->ptr_;
@@ -552,12 +632,16 @@ PortableServer::ObjectId_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+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
 // *************************************************************
@@ -570,7 +654,7 @@ PortableServer::ObjectId_out::ObjectId_out (ObjectId *&p)
 }
 
 ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p) // constructor from _var
+PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -578,18 +662,20 @@ PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p) // constructor from
 }
 
 ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (const ::PortableServer::ObjectId_out &p) // copy constructor
+PortableServer::ObjectId_out::ObjectId_out (const ::PortableServer::ObjectId_out &p)
   : ptr_ (ACE_const_cast (ObjectId_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableServer::ObjectId_out &
+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 &
+ACE_INLINE
+::PortableServer::ObjectId_out &
 PortableServer::ObjectId_out::operator= (ObjectId *p)
 {
   this->ptr_ = p;
@@ -602,223 +688,256 @@ PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *&
+ACE_INLINE
+::PortableServer::ObjectId *&
 PortableServer::ObjectId_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
 PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableServer::ForwardRequest
-// *************************************************************
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// *************************************************************
-// Inline operations for exception PortableServer::NotAGroupObject
-// *************************************************************
-
+// 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_
 
-// = Static operations.
-ACE_INLINE PortableServer::ObjectId *
+ACE_INLINE
+PortableServer::ObjectId *
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   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)
-// Free the sequence.
+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) // Default constructor.
+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) // Constructor using a maximum length value.
+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)
+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)
-// Copy constructor.
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
-// Assignment operator.
+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;
-
+    {
+      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_);
+      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_);
-
+    {
+      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_);
-
+  
+  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];
-
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE PortableServer::ObjectId &
+ACE_INLINE
+PortableServer::ObjectId &
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  PortableServer::ObjectId* tmp = ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
+  PortableServer::ObjectId* tmp =
+    ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const PortableServer::ObjectId &
+ACE_INLINE
+const PortableServer::ObjectId &
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  PortableServer::ObjectId * const tmp = ACE_reinterpret_cast (PortableServer::ObjectId* ACE_CAST_CONST, this->buffer_);
+  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 *
+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_);
+      // 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;
+      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 *
+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_);
+  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)
+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);
-  }
+    {
+      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 */
+#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) // default constructor
+PortableServer::IDs_var::IDs_var (void)
   : ptr_ (0)
 {}
 
@@ -828,21 +947,26 @@ PortableServer::IDs_var::IDs_var (IDs *p)
 {}
 
 ACE_INLINE
-PortableServer::IDs_var::IDs_var (const ::PortableServer::IDs_var &p) // copy constructor
+PortableServer::IDs_var::IDs_var (const ::PortableServer::IDs_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableServer::IDs (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableServer::IDs (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-PortableServer::IDs_var::~IDs_var (void) // destructor
+PortableServer::IDs_var::~IDs_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableServer::IDs_var &
+ACE_INLINE
+PortableServer::IDs_var &
 PortableServer::IDs_var::operator= (IDs *p)
 {
   delete this->ptr_;
@@ -850,7 +974,8 @@ PortableServer::IDs_var::operator= (IDs *p)
   return *this;
 }
 
-ACE_INLINE ::PortableServer::IDs_var &
+ACE_INLINE
+::PortableServer::IDs_var &
 PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
 {
   if (this != &p)
@@ -862,9 +987,13 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
         }
       else
         {
-          IDs *deep_copy =
-            new IDs (*p.ptr_);
-
+          IDs *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IDs (*p.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
               IDs *tmp = deep_copy;
@@ -874,17 +1003,19 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::PortableServer::IDs *
+ACE_INLINE
+const ::PortableServer::IDs *
 PortableServer::IDs_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_var::operator-> (void)
 {
   return this->ptr_;
@@ -897,50 +1028,54 @@ PortableServer::IDs_var::operator const ::PortableServer::IDs &() const // cast
 }
 
 ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::ObjectId &
+ACE_INLINE
+PortableServer::ObjectId &
 PortableServer::IDs_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const PortableServer::ObjectId &
+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 &
+ACE_INLINE
+const ::PortableServer::IDs &
 PortableServer::IDs_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs &
+ACE_INLINE
+::PortableServer::IDs &
 PortableServer::IDs_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::PortableServer::IDs *&
+ACE_INLINE
+::PortableServer::IDs *&
 PortableServer::IDs_var::out (void)
 {
   delete this->ptr_;
@@ -948,7 +1083,8 @@ PortableServer::IDs_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_var::_retn (void)
 {
   ::PortableServer::IDs *tmp = this->ptr_;
@@ -956,12 +1092,16 @@ PortableServer::IDs_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+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
 // *************************************************************
@@ -974,7 +1114,7 @@ PortableServer::IDs_out::IDs_out (IDs *&p)
 }
 
 ACE_INLINE
-PortableServer::IDs_out::IDs_out (IDs_var &p) // constructor from _var
+PortableServer::IDs_out::IDs_out (IDs_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -982,18 +1122,20 @@ PortableServer::IDs_out::IDs_out (IDs_var &p) // constructor from _var
 }
 
 ACE_INLINE
-PortableServer::IDs_out::IDs_out (const ::PortableServer::IDs_out &p) // copy constructor
+PortableServer::IDs_out::IDs_out (const ::PortableServer::IDs_out &p)
   : ptr_ (ACE_const_cast (IDs_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableServer::IDs_out &
+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 &
+ACE_INLINE
+::PortableServer::IDs_out &
 PortableServer::IDs_out::operator= (IDs *p)
 {
   this->ptr_ = p;
@@ -1006,183 +1148,243 @@ PortableServer::IDs_out::operator ::PortableServer::IDs *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *&
+ACE_INLINE
+::PortableServer::IDs *&
 PortableServer::IDs_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::ObjectId &
+ACE_INLINE
+PortableServer::ObjectId &
 PortableServer::IDs_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-
-#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_THREADPOLICY___CI_)
 #define _PORTABLESERVER_THREADPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_LIFESPANPOLICY___CI_)
 #define _PORTABLESERVER_LIFESPANPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_IDUNIQUENESSPOLICY___CI_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_IDASSIGNMENTPOLICY___CI_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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;
+}
 
 #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_SERVANTRETENTIONPOLICY___CI_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_REQUESTPROCESSINGPOLICY___CI_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// *************************************************************
-// Inline operations for exception PortableServer::POAManager::AdapterInactive
-// *************************************************************
-
+// 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;
+}
 
 #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_ADAPTERACTIVATOR___CI_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_SERVANTMANAGER___CI_)
 #define _PORTABLESERVER_SERVANTMANAGER___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_SERVANTACTIVATOR___CI_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_SERVANTLOCATOR___CI_)
 #define _PORTABLESERVER_SERVANTLOCATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterAlreadyExists
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterNonExistent
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::InvalidPolicy
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::NoServant
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ObjectAlreadyActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ObjectNotActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ServantAlreadyActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ServantNotActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::WrongAdapter
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::WrongPolicy
-// *************************************************************
-
+// 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;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableServer::Current::NoContext
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_CURRENT___CI_)
 #define _PORTABLESERVER_CURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_
@@ -1191,6 +1393,7 @@ CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const PortableServer::ObjectId &
   );
+
 CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     PortableServer::ObjectId &
@@ -1200,52 +1403,90 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableServer::ForwardRequest &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.forward_reference.in ())
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.forward_reference.in ())
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::ForwardRequest &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    PortableServer::ForwardRequest &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.forward_reference.out ())
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableServer::NotAGroupObject &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,PortableServer::NotAGroupObject&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    PortableServer::NotAGroupObject&
+  )
 {
   return 1;
 }
 
+// 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_IDs_I_
 #define _TAO_CDR_OP_PortableServer_IDs_I_
@@ -1254,6 +1495,7 @@ CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const PortableServer::IDs &
   );
+
 CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     PortableServer::IDs &
@@ -1261,144 +1503,176 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
 {
   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;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
 {
   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;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
 {
   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;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
 {
   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;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
   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;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
   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;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
 {
   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;
 }
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
index 62465713000..71c8aee9be5 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -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 "PortableServer_EXPORTS" /YX /FD /c

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

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

 # SUBTRACT CPP /YX

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

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

@@ -173,6 +173,19 @@ SOURCE=.\Default_Acceptor_Filter.cpp
 # Begin Source File

 

 SOURCE=.\Default_ORTC.cpp

+

+!IF  "$(CFG)" == "PortableServer - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -281,6 +294,19 @@ SOURCE=.\PortableServer_PolicyFactory.cpp
 # Begin Source File

 

 SOURCE=.\PortableServerC.cpp

+

+!IF  "$(CFG)" == "PortableServer - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File