ChangeLogTag:Fri Aug 23 11:23:07 2002 Ossama Othman <ossama@uci.edu>

18 files changed, 517 insertions, 1548 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2771c4be178..539e35b7ce5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,77 @@
+Fri Aug 23 11:23:07 2002  Ossama Othman  <ossama@uci.edu>
+
+	* TAO_IDL/be/be_visitor_constant/constant_cs.cpp (visit_constant):
+
+	  Fixed unused argument warning.
+
+	* tao/PortableServer/ObjectReferenceTemplate.h
+	  (~TAO_ObjectReferenceTemplate):
+
+	  Made this destructor protected to enforce proper memory
+	  management through reference counting since this
+	  ObjectReferenceTemplate implementation is reference counted.
+
+	  (destroy):
+	* tao/PortableServer/ObjectReferenceTemplate.cpp (destroy):
+
+	  Removed this unused, unnecessary and useless method.
+
+	  (make_object):
+
+	  No need to store the created object reference in a temporary
+	  variable.  Just return it.
+
+	* tao/PortableServer/ObjectReferenceFactory.h:
+	* tao/PortableServer/ObjectReferenceFactory.i:
+	* tao/PortableServer/ObjectReferenceFactory.cpp:
+
+	  Removed these unused files.
+
+	* tao/PortableServer/Default_ORT.pidl:
+
+	  Removed default ObjectReferenceFactory ValueType.  It is no
+	  longer needed.
+
+	  Updated tao_idl invocation comments to not include any export
+	  commands.  There is no need to export the ValueType in the
+	  generated stub since it is only meant to be used internally by
+	  TAO's POA.
+
+	  Added comments explaining how to regenerate the Default_ORTC.*
+	  stub files.
+
+	* tao/PortableServer/Default_ORTC.h:
+	* tao/PortableServer/Default_ORTC.i:
+	* tao/PortableServer/Default_ORTC.cpp:
+
+	  Regenerated the stubs files.
+
+	* tao/PortableServer/POA.h:
+
+	  Removed unnecessary "friend class TAO_ObjectReferenceFactory"
+	  declaration.
+
+	* tao/PortableServer/POA.cpp:
+
+	  No need to include "ObjectReferenceFactory.h".  The class
+	  declared in that header was never used.
+
+	* tao/PortableServer/PortableServer.pidl:
+
+	  Corrected comments on patch generation.  The given shell code
+	  didn't work.
+
+	* tao/PortableServer/Makefile:
+	* tao/PortableServer/Makefile.bor:
+	* tao/PortableServer/TAO_PortableServer.dsp:
+
+	  Removed all references to the ObjectReferenceFactory.* files.
+
+	* tao/PortableServer/diffs/Default_ORT.diff:
+
+	  Regenerated this patch.  It has been improved to remove
+	  inclusion of several unnecessary headers.
+
 Fri Aug 23 10:34:36 2002  Ossama Othman  <ossama@uci.edu>
 
 	* examples/POA/Generic_Servant/client.cpp (main):
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
index b3b45af834d..3a55d073cc8 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_constant, 
-           constant_cs, 
+ACE_RCSID (be_visitor_constant,
+           constant_cs,
            "$Id$")
 
 
@@ -39,12 +39,12 @@ be_visitor_constant_cs::~be_visitor_constant_cs (void)
 
 // visit the Constant_cs node and its scope
 int
-be_visitor_constant_cs::visit_constant (be_constant *node)
+be_visitor_constant_cs::visit_constant (be_constant * /* node */)
 {
 /*
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (!node->cli_stub_gen () 
+  if (!node->cli_stub_gen ()
       && !node->imported ()
       && !be_global->gen_inline_constants ())
     {
@@ -64,7 +64,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
                 }
 
               *os << ")" << be_nl;
-              be_module *module = 
+              be_module *module =
                 be_module::narrow_from_scope (node->defined_in ());
 
               if (!module || this->gen_nested_namespace_begin (module) == -1)
@@ -106,7 +106,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
               os->indent ();
 
               *os << "const ";
-              
+
               if (node->et () == AST_Expression::EV_enum)
                 {
                   *os << node->enum_full_name ();
@@ -115,7 +115,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
                 {
                   *os << node->exprtype_to_string ();
                 }
-               
+
               *os << " "
                   << node->name () << " = " << node->constant_value ()
                   << ";\n\n";
diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl
index e4580e8df89..9150a33028f 100644
--- a/TAO/tao/PortableServer/Default_ORT.pidl
+++ b/TAO/tao/PortableServer/Default_ORT.pidl
@@ -11,20 +11,25 @@
  *
  *   tao_idl.exe
  *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
- *        -Wb,export_macro=TAO_PortableServer_Export
- *        -Wb,export_include=portableserver_export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Default_ORT.pidl
  *
  * and then:
  *
- * cp orig/Default_ORT.{h,i,cpp} .
+ * cp orig/Default_ORTC.{h,i,cpp} .
  * patch < diffs/Default_ORT.diff
  *
  * The code left in Default_ORTC.{h,i,cpp} is
  * ready for use.
  *
+ *
+ * @note The diffs were generated using:
+ *
+ *   rm diffs/Default_ORT.diff
+ *   for i in Default_ORTC.{h,i,cpp}; do
+ *     diff -wub orig/$i $i >> diffs/Default_ORT.diff
+ *   done
  */
 
 #ifndef TAO_DEFAULT_ORT_PIDL
@@ -34,10 +39,8 @@
 
 module TAO_Default_ORT
 {
-  valuetype ObjectReferenceFactory : PortableInterceptor::ObjectReferenceFactory {};
-
-  valuetype ObjectReferenceTemplate : PortableInterceptor::ObjectReferenceTemplate {};
+  valuetype ObjectReferenceTemplate
+    : PortableInterceptor::ObjectReferenceTemplate {};
 };
 
 #endif /* TAO_DEFAULT_ORT_PIDL */
-
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index ac0d524cbc4..477556fba35 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -19,18 +19,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Default_ORTC.h"
 
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:315
 
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+#include "Default_ORTC.h"
 
+#include "tao/Any.h"
 #include "tao/ValueFactory.h"
 
 #if defined (__BORLANDC__)
@@ -41,340 +36,32 @@
 #include "Default_ORTC.i"
 #endif /* !defined INLINE */
 
-static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceFactory[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  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 (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceFactory:1.0
-  23,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
-  0, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-  0, // member count
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceFactory (
-    CORBA::tk_value,
-    sizeof (_oc_TAO_Default_ORT_ObjectReferenceFactory),
-    (char *) &_oc_TAO_Default_ORT_ObjectReferenceFactory,
-    0,
-    sizeof (TAO_Default_ORT::ObjectReferenceFactory)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TAO_Default_ORT)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceFactory, &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceFactory)
-TAO_NAMESPACE_END
-
-void
-tao_TAO_Default_ORT_ObjectReferenceFactory_add_ref (
-    TAO_Default_ORT::ObjectReferenceFactory *p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-tao_TAO_Default_ORT_ObjectReferenceFactory_remove_ref (
-    TAO_Default_ORT::ObjectReferenceFactory *p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-// *************************************************************
-// Operations for class TAO_Default_ORT::ObjectReferenceFactory_var
-// *************************************************************
-
-TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (ObjectReferenceFactory* p)
-  : ptr_ (p)
-{}
-
-TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory* p)
-  : ptr_ (ACE_const_cast(ObjectReferenceFactory*, p))
-{}
-
-TAO_Default_ORT::ObjectReferenceFactory* 
-TAO_Default_ORT::ObjectReferenceFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p) // copy constructor
-{
-  CORBA::add_ref (p.ptr ());
-  this->ptr_ = p.ptr ();
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_var::~ObjectReferenceFactory_var (void) // destructor
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_var &
-TAO_Default_ORT::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory* p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_var &
-TAO_Default_ORT::ObjectReferenceFactory_var::operator= (const ObjectReferenceFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::remove_ref (this->ptr_);
-    ObjectReferenceFactory* tmp = p.ptr ();
-    CORBA::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_var::operator const TAO_Default_ORT::ObjectReferenceFactory* () const // cast
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_var::operator TAO_Default_ORT::ObjectReferenceFactory* () // cast 
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* 
-TAO_Default_ORT::ObjectReferenceFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory*
-TAO_Default_ORT::ObjectReferenceFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* &
-TAO_Default_ORT::ObjectReferenceFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* &
-TAO_Default_ORT::ObjectReferenceFactory_var::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* 
-TAO_Default_ORT::ObjectReferenceFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ObjectReferenceFactory* tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-void
-TAO_Default_ORT::ObjectReferenceFactory_var::tao_add_ref (
-    ObjectReferenceFactory *p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-TAO_Default_ORT::ObjectReferenceFactory_var::tao_remove_ref (
-    ObjectReferenceFactory *p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-// *************************************************************
-// Operations for class TAO_Default_ORT::ObjectReferenceFactory_out
-// *************************************************************
-
-TAO_Default_ORT::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory* &p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_)
-{}
-
-TAO_Default_ORT::ObjectReferenceFactory_out &
-TAO_Default_ORT::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_out &
-TAO_Default_ORT::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_var &p)
-{
-  ObjectReferenceFactory* tmp = p.ptr ();
-  CORBA::add_ref (tmp);
-  this->ptr_ = tmp;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_out &
-TAO_Default_ORT::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory* p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory_out::operator TAO_Default_ORT::ObjectReferenceFactory* &() // cast
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* &
-TAO_Default_ORT::ObjectReferenceFactory_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* 
-TAO_Default_ORT::ObjectReferenceFactory_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceFactory* TAO_Default_ORT::ObjectReferenceFactory::_downcast (CORBA::ValueBase* v)
-{
-  if (v == 0) return 0;
-  return (ObjectReferenceFactory* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
-}
-
-const char* TAO_Default_ORT::ObjectReferenceFactory::_tao_obv_repository_id () const
-{
-  return this->_tao_obv_static_repository_id ();
-}
-
-void* TAO_Default_ORT::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
-{
-  if (type_id == (ptr_arith_t) &_downcast)
-    return this;
-  void *rval = 0;
-  if (rval == 0)
-    rval = ACE_NESTED_CLASS (PortableInterceptor,ObjectReferenceFactory)::_tao_obv_narrow (type_id);
-  return rval;
-}
-
-void
-TAO_Default_ORT::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectReferenceFactory *tmp = ACE_static_cast (ObjectReferenceFactory*, _tao_void_pointer);
-  delete tmp;
-}
-
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceFactory::_tao_marshal_v (TAO_OutputCDR & strm)
-{
-  return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (strm);
-}
-
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal_v (TAO_InputCDR & strm)
-{
-  return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (strm);
-}
-
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal (
-    TAO_InputCDR &strm, 
-    ObjectReferenceFactory *&new_object
-  )
-{
-  CORBA::ValueBase *base;
-  CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval = 
-    CORBA::ValueBase::_tao_unmarshal_pre (
-        strm, 
-        factory.out (), 
-        base,
-        ObjectReferenceFactory::_tao_obv_static_repository_id ()
-      );
-
-  if (retval == 0 || factory.in () == 0)
-    {
-      return 0;
-    }
-
-  base = factory->create_for_unmarshal ();
-
-  if (base == 0)
-    {
-      return 0;  // %! except.?
-    }
-
-  retval = base->_tao_unmarshal_v (strm);
-
-  if (retval == 0) 
-    {
-      return 0;
-    }
 
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-  new_object = ObjectReferenceFactory::_downcast (base);
-  return retval;
-}
+// TAO_IDL - Generated from
+// 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 (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x44656661),
+  ACE_NTOHL (0x756c745f),
+  ACE_NTOHL (0x4f52542f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x6174653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
   24,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
   0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -392,9 +79,17 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_Default_ORT)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplate, &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceTemplate,
+    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate
+  )
 TAO_NAMESPACE_END
 
+
+// TAO_IDL - Generated from
+// be/be_visitor_valuetype/valuetype_cs.cpp:95
+
 void
 tao_TAO_Default_ORT_ObjectReferenceTemplate_add_ref (
     TAO_Default_ORT::ObjectReferenceTemplate *p
@@ -411,11 +106,14 @@ tao_TAO_Default_ORT_ObjectReferenceTemplate_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// be/be_valuetype.cpp:299
+
 // *************************************************************
 // Operations for class TAO_Default_ORT::ObjectReferenceTemplate_var
 // *************************************************************
 
-TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void) // default constructor
+TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void)
   : ptr_ (0)
 {}
 
@@ -424,16 +122,16 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (Objec
 {}
 
 TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p)
-  : ptr_ (ACE_const_cast(ObjectReferenceTemplate*, p))
+  : ptr_ (ACE_const_cast (ObjectReferenceTemplate *, p))
 {}
 
-TAO_Default_ORT::ObjectReferenceTemplate* 
+TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p) // copy constructor
+TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p)
 {
   CORBA::add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
@@ -445,7 +143,7 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (void
 }
 
 TAO_Default_ORT::ObjectReferenceTemplate_var &
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate* p)
+TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate *p)
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = p;
@@ -458,10 +156,11 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTe
   if (this != &p)
   {
     CORBA::remove_ref (this->ptr_);
-    ObjectReferenceTemplate* tmp = p.ptr ();
+    ObjectReferenceTemplate *tmp = p.ptr ();
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
+
   return *this;
 }
 
@@ -470,30 +169,30 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::operator const TAO_Default_ORT::Ob
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate* () // cast 
+TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate* () // cast
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* 
+TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate*
+TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate_var::in (void) const
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* &
+TAO_Default_ORT::ObjectReferenceTemplate *&
 TAO_Default_ORT::ObjectReferenceTemplate_var::inout (void)
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* &
+TAO_Default_ORT::ObjectReferenceTemplate *&
 TAO_Default_ORT::ObjectReferenceTemplate_var::out (void)
 {
   CORBA::remove_ref (this->ptr_);
@@ -501,7 +200,7 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::out (void)
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* 
+TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -526,92 +225,118 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::tao_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// be/be_valuetype.cpp:569
+
 // *************************************************************
 // Operations for class TAO_Default_ORT::ObjectReferenceTemplate_out
 // *************************************************************
 
-TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate* &p)
+TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p) // constructor from _var
+TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p)
   : ptr_ (p.out ())
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_)
+TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p)
+  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_)
 {}
 
 TAO_Default_ORT::ObjectReferenceTemplate_out &
 TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p)
 {
-  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_;
   return *this;
 }
 
 TAO_Default_ORT::ObjectReferenceTemplate_out &
 TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p)
 {
-  ObjectReferenceTemplate* tmp = p.ptr ();
+  ObjectReferenceTemplate *tmp = p.ptr ();
   CORBA::add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
 
 TAO_Default_ORT::ObjectReferenceTemplate_out &
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate* p)
+TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator TAO_Default_ORT::ObjectReferenceTemplate* &() // cast
+TAO_Default_ORT::ObjectReferenceTemplate_out::operator TAO_Default_ORT::ObjectReferenceTemplate*& () // cast
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* &
+TAO_Default_ORT::ObjectReferenceTemplate *&
 TAO_Default_ORT::ObjectReferenceTemplate_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* 
+TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate* TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase* v)
+// *************************************************************
+
+// TAO_IDL - Generated from
+// be/be_visitor_valuetype/valuetype_cs.cpp:138
+
+TAO_Default_ORT::ObjectReferenceTemplate *
+TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0) return 0;
-  return (ObjectReferenceTemplate* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
+  if (v == 0)
+    {
+      return 0;
+    }
+
+  return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
-const char* TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id () const
+const char *
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
 {
   return this->_tao_obv_static_repository_id ();
 }
 
-void* TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
+void *
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 {
   if (type_id == (ptr_arith_t) &_downcast)
-    return this;
+    {
+      return this;
+    }
+
   void *rval = 0;
+
   if (rval == 0)
-    rval = ACE_NESTED_CLASS (PortableInterceptor,ObjectReferenceTemplate)::_tao_obv_narrow (type_id);
+    {
+      rval = ACE_NESTED_CLASS (PortableInterceptor,ObjectReferenceTemplate)::_tao_obv_narrow (type_id);
+    }
+
   return rval;
 }
 
 void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectReferenceTemplate *tmp = ACE_static_cast (ObjectReferenceTemplate*, _tao_void_pointer);
+  ObjectReferenceTemplate *tmp =
+    ACE_static_cast (
+        ObjectReferenceTemplate *,
+        _tao_void_pointer
+      );
   delete tmp;
 }
 
@@ -626,37 +351,40 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_I
 }
 
 CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
-    TAO_InputCDR &strm, 
+    TAO_InputCDR &strm,
     ObjectReferenceTemplate *&new_object
   )
 {
-  CORBA::ValueBase *base;
+  CORBA::ValueBase *base = 0;
   CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval = 
+  CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
-        strm, 
-        factory.out (), 
+        strm,
+        factory,
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
 
-  if (retval == 0 || factory.in () == 0)
+  if (retval == 0)
     {
       return 0;
     }
 
-  base = factory->create_for_unmarshal ();
-
-  if (base == 0)
+  if (factory.in () != 0)
     {
-      return 0;  // %! except.?
-    }
+      base = factory->create_for_unmarshal ();
 
-  retval = base->_tao_unmarshal_v (strm);
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
 
-  if (retval == 0) 
-    {
-      return 0;
+      retval = base->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
+        {
+          return 0;
+        }
     }
 
   // Now base must be null or point to the unmarshaled object.
@@ -665,183 +393,120 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
   return retval;
 }
 
-CORBA::Boolean 
-OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_OutputCDR &strm){
-  return _tao_marshal_state (strm);
-  
-}
-CORBA::Boolean OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_InputCDR &strm){
-  return _tao_unmarshal_state (strm);
-  
-}
-CORBA::Boolean 
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm){
+// TAO_IDL - Generated from
+// be/be_visitor_valuetype/valuetype_obv_cs.cpp:56
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm)
+{
   return _tao_marshal_state (strm);
-  
 }
-CORBA::Boolean OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm){
-  return _tao_unmarshal_state (strm);
-  
-}
-TAO_PortableServer_Export void
-operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceFactory *value) // copying
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm)
 {
-  TAO_OutputCDR stream;
-  if (stream << value)
-  {
-    any._tao_replace (
-        TAO_Default_ORT::_tc_ObjectReferenceFactory, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ());
-  }
+  return _tao_unmarshal_state (strm);
 }
+// TAO_IDL - Generated from
+// be/be_visitor_valuetype/any_op_cs.cpp:56
 
-TAO_PortableServer_Export void
-operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceFactory **value) // non-copying
+// Copying.
+void
+operator<<= (
+    CORBA::Any &any,
+    TAO_Default_ORT::ObjectReferenceTemplate *value
+  )
 {
   TAO_OutputCDR stream;
-  if (stream << *value)
-  {
-    any._tao_replace (
-        TAO_Default_ORT::_tc_ObjectReferenceFactory, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        *value,
-        TAO_Default_ORT::ObjectReferenceFactory::_tao_any_destructor);
-  }
-}
 
-TAO_PortableServer_Export CORBA::Boolean
-operator>>= (const CORBA::Any &any, TAO_Default_ORT::ObjectReferenceFactory *&value)
-{
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TAO_Default_ORT::_tc_ObjectReferenceFactory ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-    {
-      return 0; // not equivalent
-    }
-    if (any.any_owns_data ())
-    {
-      const TAO_Default_ORT::ObjectReferenceFactory *const_holder = ACE_static_cast (
-          const TAO_Default_ORT::ObjectReferenceFactory*,
-          any.value ());
-      value = ACE_const_cast (
-          TAO_Default_ORT::ObjectReferenceFactory*,
-          const_holder);
-      return 1;
-    }
-    else
+  if (stream << value)
     {
-      TAO_Default_ORT::ObjectReferenceFactory *tmp;
-      TAO_InputCDR stream (
-          any._tao_get_cdr (),
-          any._tao_byte_order ());
-      if (stream >> tmp)
-      {
-        ((CORBA::Any *)&any)->_tao_replace (
-            TAO_Default_ORT::_tc_ObjectReferenceFactory,
-            1,
-            ACE_static_cast (void *, tmp),
-            TAO_Default_ORT::ObjectReferenceFactory::_tao_any_destructor);
-        value = tmp;
-        return 1;
-      }
-      
+      any._tao_replace (
+          TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
     }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceFactory, TAO_Default_ORT::ObjectReferenceFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceFactory, TAO_Default_ORT::ObjectReferenceFactory_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_PortableServer_Export void
-operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate *value) // copying
+// Non-copying.
+void
+operator<<= (
+    CORBA::Any &any,
+    TAO_Default_ORT::ObjectReferenceTemplate **value
+  )
 {
   TAO_OutputCDR stream;
-  if (stream << value)
-  {
-    any._tao_replace (
-        TAO_Default_ORT::_tc_ObjectReferenceTemplate, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ());
-  }
-}
 
-TAO_PortableServer_Export void
-operator<<= (CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate **value) // non-copying
-{
-  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);
-  }
+    {
+      any._tao_replace (
+          TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *value,
+          TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor
+        );
+    }
 }
 
-TAO_PortableServer_Export CORBA::Boolean
-operator>>= (const CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate *&value)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &any,
+    TAO_Default_ORT::ObjectReferenceTemplate *&value
+  )
 {
   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);
+    CORBA::Boolean result =
+      type->equivalent (
+          TAO_Default_ORT::_tc_ObjectReferenceTemplate
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-    
+
     if (!result)
-    {
-      return 0; // not equivalent
-    }
+      {
+        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;
+        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
   {
@@ -857,108 +522,72 @@ operator>>= (const CORBA::Any &any, TAO_Default_ORT::ObjectReferenceTemplate *&v
   #  pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-//@@ Boris: begin experimental
-void
-CORBA::add_ref (TAO_Default_ORT::ObjectReferenceFactory * vt)
-{
-  if (vt != 0)
-  {
-    vt->_add_ref ();
-  }
-}
-
-void
-CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceFactory * vt)
-{
-  if (vt != 0)
-  {
-    vt->_remove_ref ();
-  }
-}
-
-//@@ Boris: end experimental
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const TAO_Default_ORT::ObjectReferenceFactory *_tao_valuetype)
-{
-  return CORBA_ValueBase::_tao_marshal (strm,
-    ACE_const_cast (TAO_Default_ORT::ObjectReferenceFactory*, _tao_valuetype),
-    (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceFactory::_downcast);
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, TAO_Default_ORT::ObjectReferenceFactory *&_tao_valuetype)
-{
-  return TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal (strm, _tao_valuetype);
-}
-
-CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_marshal_state (TAO_OutputCDR &)
-{
-  if (
-    1
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceFactory::_tao_unmarshal_state (TAO_InputCDR &)
-{
-  if (
-    1
-  )
-    return 1;
-  else
-    return 0;
-  
-}
+// TAO_IDL - Generated from
+// be/be_valuetype.cpp:742
 
-//@@ Boris: begin experimental
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
 {
   if (vt != 0)
-  {
-    vt->_add_ref ();
-  }
+    {
+      vt->_add_ref ();
+    }
 }
 
 void
 CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
 {
   if (vt != 0)
-  {
-    vt->_remove_ref ();
-  }
+    {
+      vt->_remove_ref ();
+    }
 }
 
-//@@ Boris: end experimental
+// TAO_IDL - Generated from
+// be/be_visitor_valuetype/cdr_op_cs.cpp:70
+
 CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype)
+operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype
+  )
 {
-  return CORBA_ValueBase::_tao_marshal (strm,
-    ACE_const_cast (TAO_Default_ORT::ObjectReferenceTemplate*, _tao_valuetype),
-    (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast);
+  return
+    CORBA_ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            TAO_Default_ORT::ObjectReferenceTemplate *,
+            _tao_valuetype
+          ),
+        (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast
+      );
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR &strm, TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype)
+operator>> (
+    TAO_InputCDR &strm,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype
+  )
 {
   return TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
 }
 
+// TAO_IDL - Generated from
+// be/be_visitor_valuetype/marshal_cs.cpp:44
+
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
 {
   if (
     1
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
 CORBA::Boolean
@@ -966,10 +595,12 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
 {
   if (
     1
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
-
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index 5468bee7b1e..abdd87c6103 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 
@@ -29,19 +33,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
 #include "tao/ObjectReferenceTemplateC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+#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 TAO_PortableServer_Export
+#  define TAO_EXPORT_NESTED_MACRO
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -55,132 +58,15 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:45
+
 TAO_NAMESPACE  TAO_Default_ORT
 {
-  // Valuetype class
-  class ObjectReferenceFactory;
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___PTR_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___PTR_CH_
-
-  typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___VAR_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___VAR_CH_
-
-  class TAO_PortableServer_Export ObjectReferenceFactory_var
-  {
-  public:
-    ObjectReferenceFactory_var (void); // default constructor
-    ObjectReferenceFactory_var (ObjectReferenceFactory*);
-    ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension)
-    ObjectReferenceFactory_var (const ObjectReferenceFactory_var &); // copy constructor
-    ~ObjectReferenceFactory_var (void); // destructor
-
-    ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*);
-    ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &);
-    ObjectReferenceFactory* operator-> (void) const;
-
-    operator const ObjectReferenceFactory* () const;
-    operator ObjectReferenceFactory* ();
-    // in, inout, out, _retn
-    ObjectReferenceFactory* in (void) const;
-    ObjectReferenceFactory* &inout (void);
-    ObjectReferenceFactory* &out (void);
-    ObjectReferenceFactory* _retn (void);
-    ObjectReferenceFactory* ptr (void) const;
-
-    // Hooks used by template sequence and valuetype manager classes
-    // for non-defined forward declared valuetypes.
-    static void tao_add_ref (ObjectReferenceFactory *);
-    static void tao_remove_ref (ObjectReferenceFactory *);
-
-  private:
-    ObjectReferenceFactory* ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OUT_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OUT_CH_
-
-  class TAO_PortableServer_Export ObjectReferenceFactory_out
-  {
-  public:
-    ObjectReferenceFactory_out (ObjectReferenceFactory* &);
-    ObjectReferenceFactory_out (ObjectReferenceFactory_var &);
-    ObjectReferenceFactory_out (const ObjectReferenceFactory_out &);
-    ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_out &);
-    ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_var &);
-    ObjectReferenceFactory_out &operator= (ObjectReferenceFactory*);
-    operator ObjectReferenceFactory* &();
-    ObjectReferenceFactory* &ptr (void);
-    ObjectReferenceFactory* operator-> (void);
-
-  private:
-    ObjectReferenceFactory* &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY_CH_
-
-  class TAO_PortableServer_Export ObjectReferenceFactory
-    : public virtual PortableInterceptor::ObjectReferenceFactory
-  {
-  public:
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ObjectReferenceFactory* _ptr_type;
-    typedef ObjectReferenceFactory_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static ObjectReferenceFactory* _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 &,
-        ObjectReferenceFactory *&
-      );
-    virtual const char* _tao_obv_repository_id () const;
-    static const char* _tao_obv_static_repository_id ();
-
-    static void _tao_any_destructor (void *);
-
-
-  protected:
-    ObjectReferenceFactory ();
-    virtual ~ObjectReferenceFactory ();
 
-    // TAO internals
-    virtual void *_tao_obv_narrow (ptr_arith_t);
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+  // TAO_IDL - Generated from
+  // be/be_visitor_valuetype/valuetype_ch.cpp:53
 
-  private:
-    ObjectReferenceFactory (const ObjectReferenceFactory &);
-    void operator= (const ObjectReferenceFactory &);
-
-  protected:
-    virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_OutputCDR &) = 0;
-    virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_InputCDR &) = 0;
-
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
-  // Valuetype class
   class ObjectReferenceTemplate;
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_)
@@ -194,14 +80,17 @@ TAO_NAMESPACE  TAO_Default_ORT
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_
 
-  class TAO_PortableServer_Export ObjectReferenceTemplate_var
+  // TAO_IDL - Generated from
+  // be/be_valuetype.cpp:182
+
+  class  ObjectReferenceTemplate_var
   {
   public:
-    ObjectReferenceTemplate_var (void); // default constructor
+    ObjectReferenceTemplate_var (void);
     ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
     ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor
-    ~ObjectReferenceTemplate_var (void); // destructor
+    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &);
+    ~ObjectReferenceTemplate_var (void);
 
     ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
     ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
@@ -211,8 +100,8 @@ TAO_NAMESPACE  TAO_Default_ORT
     operator ObjectReferenceTemplate* ();
     // in, inout, out, _retn
     ObjectReferenceTemplate* in (void) const;
-    ObjectReferenceTemplate* &inout (void);
-    ObjectReferenceTemplate* &out (void);
+    ObjectReferenceTemplate*& inout (void);
+    ObjectReferenceTemplate*& out (void);
     ObjectReferenceTemplate* _retn (void);
     ObjectReferenceTemplate* ptr (void) const;
 
@@ -232,7 +121,10 @@ TAO_NAMESPACE  TAO_Default_ORT
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_
 
-  class TAO_PortableServer_Export ObjectReferenceTemplate_out
+  // TAO_IDL - Generated from
+  // be/be_valuetype.cpp:491
+
+  class  ObjectReferenceTemplate_out
   {
   public:
     ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
@@ -241,8 +133,8 @@ TAO_NAMESPACE  TAO_Default_ORT
     ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
     ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
     ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
-    operator ObjectReferenceTemplate* &();
-    ObjectReferenceTemplate* &ptr (void);
+    operator ObjectReferenceTemplate*& ();
+    ObjectReferenceTemplate*& ptr (void);
     ObjectReferenceTemplate* operator-> (void);
 
   private:
@@ -256,53 +148,58 @@ TAO_NAMESPACE  TAO_Default_ORT
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
 
-  class TAO_PortableServer_Export ObjectReferenceTemplate
-    : public virtual PortableInterceptor::ObjectReferenceTemplate
-  {
-  public:
+  class  ObjectReferenceTemplate
+    : public virtual PortableInterceptor::ObjectReferenceTemplate,
+    public virtual CORBA_ValueBase
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ObjectReferenceTemplate* _ptr_type;
-    typedef ObjectReferenceTemplate_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+{
+public:
+  typedef ObjectReferenceTemplate_var _var_type;
+  static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
+  // The address of static _downcast is implicit used as type id
 
-    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);
 
-    // (TAO extensions or internals)
-    static CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ObjectReferenceTemplate *&
-      );
-    virtual const char* _tao_obv_repository_id () const;
-    static const char* _tao_obv_static_repository_id ();
+  static void _tao_any_destructor (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);
 
-  protected:
-    ObjectReferenceTemplate ();
-    virtual ~ObjectReferenceTemplate ();
+  // TAO internals
+  virtual void *_tao_obv_narrow (ptr_arith_t);
+  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
 
-    // TAO internals
-    virtual void *_tao_obv_narrow (ptr_arith_t);
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+private:
+  ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+  void operator= (const ObjectReferenceTemplate &);
 
-  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;
 
-  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_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
 
 }
 TAO_NAMESPACE_CLOSE // module TAO_Default_ORT
@@ -315,37 +212,16 @@ TAO_NAMESPACE_CLOSE
 TAO_NAMESPACE  OBV_TAO_Default_ORT
 {
 
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OBV_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCEFACTORY___OBV_CH_
-
-  // OBV_ class
-  class TAO_PortableServer_Export ObjectReferenceFactory
-    : public virtual TAO_Default_ORT::ObjectReferenceFactory
-  {
-  public:
-
-  protected:
-    virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceFactory (TAO_InputCDR &);
-    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
-    CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-
-  private:
-
-  };
-
-#endif /* end #if !defined */
-
-
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
 
   // OBV_ class
-  class TAO_PortableServer_Export ObjectReferenceTemplate
+  class  ObjectReferenceTemplate
     : public virtual TAO_Default_ORT::ObjectReferenceTemplate
   {
   public:
 
+
   protected:
     virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
     virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
@@ -353,7 +229,6 @@ TAO_NAMESPACE  OBV_TAO_Default_ORT
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
 
   private:
-
   };
 
 #endif /* end #if !defined */
@@ -361,42 +236,34 @@ TAO_NAMESPACE  OBV_TAO_Default_ORT
   }
 TAO_NAMESPACE_CLOSE
 
-// Any operators for valuetype TAO_Default_ORT::ObjectReferenceFactory
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceFactory *); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceFactory **); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceFactory *&);
 // Any operators for valuetype TAO_Default_ORT::ObjectReferenceTemplate
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, 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__
 
-//@@ Boris: begin experimental
-TAO_NAMESPACE CORBA
-{
-  void add_ref (TAO_Default_ORT::ObjectReferenceFactory *);
-  void remove_ref (TAO_Default_ORT::ObjectReferenceFactory *);
-}
-TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceFactory *);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceFactory *&);
-//@@ Boris: begin experimental
+// TAO_IDL - Generated from
+// be/be_valuetype.cpp:684
+
 TAO_NAMESPACE CORBA
 {
-  void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-  void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+  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
-//@@ Boris: end experimental
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
+// TAO_IDL - Generated from
+// 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 *&);
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:1002
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.i"
diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i
index 405dd309016..297356dcd63 100644
--- a/TAO/tao/PortableServer/Default_ORTC.i
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -19,26 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE
-TAO_Default_ORT::ObjectReferenceFactory::ObjectReferenceFactory () // default constructor
-{}
+// TAO_IDL - Generated from 
+// be/be_visitor_valuetype/valuetype_ci.cpp:58
 
 ACE_INLINE
-TAO_Default_ORT::ObjectReferenceFactory::~ObjectReferenceFactory () // destructor
+TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
 {}
 
-ACE_INLINE const char* 
-TAO_Default_ORT::ObjectReferenceFactory::_tao_obv_static_repository_id ()
-{
-  return "IDL:TAO_Default_ORT/ObjectReferenceFactory:1.0";
-}
-
 ACE_INLINE
-TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate () // default constructor
-{}
-
-ACE_INLINE
-TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate () // destructor
+TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
 ACE_INLINE const char* 
@@ -47,25 +36,21 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
   return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
 }
 
-//@@ Boris: begin experimental
-TAO_NAMESPACE CORBA
-{
-  void add_ref (TAO_Default_ORT::ObjectReferenceFactory *);
-  void remove_ref (TAO_Default_ORT::ObjectReferenceFactory *);
-}
-TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+// TAO_IDL - Generated from
+// be/be_valuetype.cpp:714
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceFactory *);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceFactory *&);
-//@@ Boris: begin experimental
+#if defined (__ACE_INLINE__)
 TAO_NAMESPACE CORBA
 {
-  void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-  void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+  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
-//@@ Boris: end experimental
+#endif /*__ACE_INLINE__*/
+
+// TAO_IDL - Generated from
+// 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 *&);
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index acef5ab031d..8c3a9bea585 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -49,7 +49,6 @@ CPP_SRCS += \
   Default_Policy_Validator \
   IORInfo \
   Default_ORTC \
-  ObjectReferenceFactory \
   ObjectReferenceTemplate \
   AMH_Response_Handler \
   PortableGroup_Hooks
@@ -856,7 +855,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  ObjectReferenceTemplate.h \
  Default_ORTC.h \
  Default_ORTC.i \
- ObjectReferenceFactory.h \
  Default_Acceptor_Filter.h \
  $(TAO_ROOT)/tao/Acceptor_Filter.h \
  $(TAO_ROOT)/tao/Acceptor_Filter.i \
@@ -6047,7 +6045,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
  $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -6131,419 +6129,27 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- Default_ORTC.i $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ Default_ORTC.i $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Policy_ForwardC.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/objectid.h \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Set.h \
- $(TAO_ROOT)/tao/Policy_Set.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/DLL.h \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/params.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/XML_Svc_Conf.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/PICurrent.h \
- $(TAO_ROOT)/tao/PICurrent.inl \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Framework_Component.h \
- $(ACE_ROOT)/ace/Framework_Component.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.h \
- $(ACE_ROOT)/ace/Framework_Component_T.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/LF_Event.h \
- $(TAO_ROOT)/tao/LF_Event.inl \
- $(TAO_ROOT)/tao/GIOP_Message_Version.h \
- $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h \
- $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
- $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
- $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
- $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i
-
-.obj/ObjectReferenceFactory.o .obj/ObjectReferenceFactory.so .shobj/ObjectReferenceFactory.o .shobj/ObjectReferenceFactory.so: ObjectReferenceFactory.cpp \
- ObjectReferenceFactory.h \
- $(ACE_ROOT)/ace/pre.h \
- portableserver_export.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- Default_ORTC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Time_Value.inl \
- $(ACE_ROOT)/ace/Default_Constants.h \
- $(ACE_ROOT)/ace/Global_Macros.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/String_Base.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/String_Base_Const.h \
- $(ACE_ROOT)/ace/String_Base.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/String_Base.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- Default_ORTC.i \
- PortableServerC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Policy_ForwardC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Policy_ForwardC.i \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- PortableServerC.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/DLL.h \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(ACE_ROOT)/ace/XML_Svc_Conf.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- poa_macros.h \
- Servant_Base.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(ACE_ROOT)/ace/Atomic_Op.h \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
- Servant_Base.i \
- Active_Object_Map.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- Active_Object_Map.i \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- Default_Policy_Validator.h \
- $(TAO_ROOT)/tao/Policy_Validator.h \
- POA_Policy_Set.h \
- POA_Policies.h \
- POA_Policies.i \
- $(TAO_ROOT)/tao/Policy_Set.h \
- $(TAO_ROOT)/tao/Policy_Set.i \
- POA_Policy_Set.i \
- Object_Adapter.i \
- POAManager.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- POAManager.i \
- POA_Cached_Policies.h \
- POA_Cached_Policies.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 
 .obj/ObjectReferenceTemplate.o .obj/ObjectReferenceTemplate.so .shobj/ObjectReferenceTemplate.o .shobj/ObjectReferenceTemplate.so: ObjectReferenceTemplate.cpp \
- ObjectReferenceTemplate.h \
- $(ACE_ROOT)/ace/pre.h \
+ ObjectReferenceTemplate.h $(ACE_ROOT)/ace/pre.h \
  portableserver_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- Default_ORTC.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl Default_ORTC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -6662,11 +6268,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- Default_ORTC.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- PortableServerC.h \
+ Default_ORTC.i POA.h Object_Adapter.h portableserver_export.h \
+ Key_Adapters.h PortableServerC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -6681,8 +6284,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- PortableServerC.i \
+ $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
  $(ACE_ROOT)/ace/Map_T.h \
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
@@ -6731,32 +6333,24 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- poa_macros.h \
+ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \
  Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
- Servant_Base.i \
+ $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \
  Active_Object_Map.h \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- Active_Object_Map.i \
- $(TAO_ROOT)/tao/Adapter.h \
+ Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  Default_Policy_Validator.h \
- $(TAO_ROOT)/tao/Policy_Validator.h \
- POA_Policy_Set.h \
- POA_Policies.h \
- POA_Policies.i \
+ $(TAO_ROOT)/tao/Policy_Validator.h POA_Policy_Set.h \
+ POA_Policies.h POA_Policies.i \
  $(TAO_ROOT)/tao/Policy_Set.h \
- $(TAO_ROOT)/tao/Policy_Set.i \
- POA_Policy_Set.i \
- Object_Adapter.i \
- POAManager.h \
+ $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
+ Object_Adapter.i POAManager.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -6768,10 +6362,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- POAManager.i \
- POA_Cached_Policies.h \
- POA_Cached_Policies.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
+ POA_Cached_Policies.h POA_Cached_Policies.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(ACE_ROOT)/ace/Containers.h \
@@ -6781,57 +6373,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.inl \
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/objectid.h \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/PICurrent.h \
- $(TAO_ROOT)/tao/PICurrent.inl \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Framework_Component.h \
- $(ACE_ROOT)/ace/Framework_Component.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.h \
- $(ACE_ROOT)/ace/Framework_Component_T.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i
+ $(ACE_ROOT)/ace/Containers_T.cpp POA.i
 
 .obj/AMH_Response_Handler.o .obj/AMH_Response_Handler.so .shobj/AMH_Response_Handler.o .shobj/AMH_Response_Handler.so: AMH_Response_Handler.cpp \
  AMH_Response_Handler.h portableserver_export.h \
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor
index bc2527cc243..7504ace2f2c 100644
--- a/TAO/tao/PortableServer/Makefile.bor
+++ b/TAO/tao/PortableServer/Makefile.bor
@@ -18,7 +18,6 @@ OBJFILES = \
         $(OBJDIR)\IORInfo.obj \
 	$(OBJDIR)\Key_Adapters.obj \
 	$(OBJDIR)\Object_Adapter.obj \
-        $(OBJDIR)\ObjectReferenceFactory.obj \
         $(OBJDIR)\ObjectReferenceTemplate.obj \
 	$(OBJDIR)\Operation_Table.obj \
 	$(OBJDIR)\ORB_Manager.obj \
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
deleted file mode 100644
index fbdc5328c08..00000000000
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/PortableServer/ObjectReferenceFactory.h"
-
-ACE_RCSID (PortableServer,
-           ObjectReferenceFactory,
-           "$Id$")
-
-#include "tao/PortableServer/PortableServerC.h"
-#include "tao/PortableServer/POA.h"
-
-# if !defined (__ACE_INLINE__)
-#   include "tao/PortableServer/ObjectReferenceFactory.i"
-# endif /* !__ACE_INLINE__ */
-
-TAO_ObjectReferenceFactory::TAO_ObjectReferenceFactory (TAO_POA *poa)
-  : poa_ (poa),
-    servant_ (0),
-    make_object_invoker_ (0)
-{
-  // Constructor
-}
-
-CORBA::Object *
-TAO_ObjectReferenceFactory::make_object (
-    const char *intf,
-    const PortableInterceptor::ObjectId & id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  PortableServer::ObjectId oid;
-  oid.replace (id.maximum (),
-               id.length (),
-               ACE_const_cast (CORBA::Octet *,id.get_buffer ()),
-               0);
-
-  // Create a reference
-  CORBA::Object_var object =
-    this->poa_->invoke_key_to_object (intf,
-                                      oid
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return object._retn ();
-}
-
-void
-TAO_ObjectReferenceFactory::set_servant (PortableServer::Servant
-                                         servant)
-{
-  this->servant_ = servant;
-}
-
-void
-TAO_ObjectReferenceFactory::make_object_invoker (CORBA::ULong identifier)
-{
-  this->make_object_invoker_ = identifier;
-}
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h
deleted file mode 100644
index 184f2cee1df..00000000000
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file ObjectReferenceFactory.h
- *
- * $Id$
- *
- * This is the implementation of the
- * PortableInterceptor::ObjectReferenceFactory interface.
- *
- * @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_OBJECT_REFERENCE_FACTORY_H
-#define TAO_OBJECT_REFERENCE_FACTORY_H
-
-#include "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Default_ORTC.h"
-
-#include "tao/PortableServer/PortableServerC.h"
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_POA;
-
-/**
- * @class TAO_ObjectReferenceFactory
- *
- * @brief Implementation of the PortableInterceptor::ObjectReferenceFactory
- *        interface.
- */
-class TAO_PortableServer_Export TAO_ObjectReferenceFactory
-  : public virtual CORBA::DefaultValueRefCountBase
-  , public virtual OBV_TAO_Default_ORT::ObjectReferenceFactory
-{
- public:
-
-  /// Constructor
-  TAO_ObjectReferenceFactory (TAO_POA *poa);
-
-  virtual CORBA::Object_ptr make_object (
-      const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void set_servant (PortableServer::Servant servant);
-
-  void make_object_invoker (CORBA::ULong identifier);
-
- private:
-
-  TAO_POA *poa_;
-
-  PortableServer::Servant servant_;
-
-  CORBA::ULong make_object_invoker_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-
-#endif /* TAO_OBJECT_REFERENCE_FACTORY_H */
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.i b/TAO/tao/PortableServer/ObjectReferenceFactory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
index 9037235e8df..f65d538668e 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
@@ -1,26 +1,23 @@
-#include "tao/PortableServer/ObjectReferenceTemplate.h"
-#include "tao/PortableServer/POA.h"
-
-#include "tao/ORB_Core.h"
+#include "ObjectReferenceTemplate.h"
+#include "POA.h"
 
 ACE_RCSID (PortableServer,
            ObjectReferenceTemplate,
            "$Id$")
 
-TAO_ObjectReferenceTemplate::
-TAO_ObjectReferenceTemplate (const char *server_id,
-                             const char *orb_id,
-                             TAO_POA *poa)
+
+TAO_ObjectReferenceTemplate::TAO_ObjectReferenceTemplate (
+  const char *server_id,
+  const char *orb_id,
+  TAO_POA * poa)
   : server_id_ (server_id),
     orb_id_ (orb_id),
     poa_ (poa)
 {
-  /// Constructor
 }
 
 TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void)
 {
-  /// Destructor
 }
 
 char *
@@ -46,7 +43,8 @@ TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
   if (this->adapter_name_ != 0)
     {
       ACE_NEW_THROW_EX (adapter_name,
-                        PortableInterceptor::AdapterName (*(this->adapter_name_)),
+                        PortableInterceptor::AdapterName (
+                          *(this->adapter_name_)),
                         CORBA::NO_MEMORY (
                            CORBA_SystemException::_tao_minor_code (
                               TAO_DEFAULT_MINOR_CODE,
@@ -63,7 +61,8 @@ TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK_RETURN (0);
 
       ACE_NEW_THROW_EX (adapter_name,
-                        PortableInterceptor::AdapterName (*(this->adapter_name_)),
+                        PortableInterceptor::AdapterName (
+                          *(this->adapter_name_)),
                         CORBA::NO_MEMORY (
                            CORBA_SystemException::_tao_minor_code (
                               TAO_DEFAULT_MINOR_CODE,
@@ -85,24 +84,12 @@ TAO_ObjectReferenceTemplate::make_object (
     ))
 {
   PortableServer::ObjectId oid;
-
   oid.replace (id.maximum (),
                id.length (),
-               ACE_const_cast (CORBA::Octet *,id.get_buffer ()),
+               ACE_const_cast (CORBA::Octet *, id.get_buffer ()),
                0);
 
-  // Create a reference
-  CORBA::Object_var object =
-    this->poa_->invoke_key_to_object (intf,
-                                      oid
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return object._retn ();
-}
-
-void
-TAO_ObjectReferenceTemplate::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  CORBA::remove_ref (this);
+  return this->poa_->invoke_key_to_object (intf,
+                                           oid
+                                           ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
index 2aedd5cbfd6..ef71e8b8bf6 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
@@ -7,7 +7,7 @@
  * $Id$
  *
  * This is the implementation of the
- * PortableInterceptor::ObjectReferenceTemplate valuetype.
+ * PortableInterceptor::ObjectReferenceTemplate ValueType.
  *
  * @author Priyanka Gontla <gontla_p@ociweb.com>
  */
@@ -17,6 +17,7 @@
 #define TAO_OBJECT_REFERENCE_TEMPLATE_H
 
 #include "ace/pre.h"
+
 #include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -44,16 +45,20 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
   : public virtual CORBA::DefaultValueRefCountBase
   , public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate
 {
- public:
+public:
 
   /// Constructor
   TAO_ObjectReferenceTemplate (const char *server_id,
                                const char *orb_id,
                                TAO_POA *poa);
 
-  /// Destructor
-  ~TAO_ObjectReferenceTemplate (void);
-
+  /**
+   * @name PortableInterceptor::ObjectReferenceTemplate Methods
+   *
+   * Methods required by the
+   * PortableInterceptor::ObjectReferenceTemplate ValueType.
+   */
+  //@{
   virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -63,7 +68,15 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
   virtual PortableInterceptor::AdapterName * adapter_name (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  //@}
+
+  /**
+   * @name PortableInterceptor::ObjectReferenceFactory Methods
+   *
+   * Methods required by the
+   * PortableInterceptor::ObjectReferenceFactory ValueType.
+   */
+  //@{
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
       const PortableInterceptor::ObjectId & id
@@ -71,8 +84,16 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
+  //@}
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+protected:
+
+  /// Destructor
+  /**
+   * Protected destructor to enforce proper memory management via
+   * reference counting.
+   */
+  ~TAO_ObjectReferenceTemplate (void);
 
 private:
 
@@ -88,4 +109,5 @@ private:
 #endif /* _MSC_VER */
 
 #include "ace/post.h"
+
 #endif /* TAO_OBJECT_REFERENCE_TEMPLATE_H */
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 67c5efe4bd0..553efa7c15e 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -17,7 +17,6 @@ ACE_RCSID (TAO_PortableServer,
 
 #include "tao/PortableServer/IORInfo.h"
 #include "tao/PortableServer/ObjectReferenceTemplate.h"
-#include "tao/PortableServer/ObjectReferenceFactory.h"
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
 
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 396c127e19a..8fcc0b34095 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -134,7 +134,6 @@ public:
   friend class TAO_POA_Current_Impl;
   friend class TAO_POA_Manager;
   friend class TAO_RT_Collocation_Resolver;
-  friend class TAO_ObjectReferenceFactory;
   friend class TAO_ObjectReferenceTemplate;
 
   typedef ACE_CString String;
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 4612d90c57a..8594f47e06e 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -35,8 +35,9 @@
  *
  * Note: The diffs were generated using:
  *
+ *   rm diffs/PortableServer.diff
  *   for i in PortableServerC.{h,i,cpp}; do
- *     diff -wub orig/$i $i > diffs/PortableServer.diff
+ *     diff -wub orig/$i $i >> diffs/PortableServer.diff
  *   done
  */
 
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
index 4ddd9d3f2ec..fec710db1a8 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -212,10 +212,6 @@ SOURCE=.\Object_Adapter.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectReferenceFactory.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectReferenceTemplate.cpp

 # End Source File

 # Begin Source File

@@ -352,10 +348,6 @@ SOURCE=.\Object_Adapter.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectReferenceFactory.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectReferenceTemplate.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/PortableServer/diffs/Default_ORT.diff b/TAO/tao/PortableServer/diffs/Default_ORT.diff
index 7e00820e756..585ff68c781 100644
--- a/TAO/tao/PortableServer/diffs/Default_ORT.diff
+++ b/TAO/tao/PortableServer/diffs/Default_ORT.diff
@@ -1,6 +1,6 @@
---- orig/Default_ORTC.h	Thu Feb  7 15:05:40 2002
-+++ Default_ORTC.h	Fri Feb  8 11:25:49 2002
-@@ -23,14 +23,14 @@
+--- orig/Default_ORTC.h	2002-08-23 11:04:47.000000000 -0700
++++ Default_ORTC.h	2002-08-23 11:06:26.000000000 -0700
+@@ -27,13 +27,13 @@
  #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
  
  #include "ace/pre.h"
@@ -11,20 +11,33 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
- #include "portableserver_export.h"
 -#include "ObjectReferenceTemplateC.h"
 +#include "tao/ObjectReferenceTemplateC.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
---- orig/Default_ORTC.cpp	Thu Feb  7 15:05:40 2002
-+++ Default_ORTC.cpp	Fri Feb  8 11:26:35 2002
-@@ -31,6 +31,8 @@
- #include "tao/ClientInterceptorAdapter.h"
- #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+--- orig/Default_ORTC.cpp	2002-08-23 11:04:47.000000000 -0700
++++ Default_ORTC.cpp	2002-08-23 11:08:50.000000000 -0700
+@@ -25,15 +25,8 @@
  
+ #include "Default_ORTC.h"
+ 
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/PortableInterceptor.h"
+-
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#include "tao/ClientRequestInfo_i.h"
+-#include "tao/ClientInterceptorAdapter.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
++#include "tao/Any.h"
 +#include "tao/ValueFactory.h"
-+
+ 
  #if defined (__BORLANDC__)
  #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
- #endif /* __BORLANDC__ */
+@@ -611,4 +604,3 @@
+       return 0;
+     }
+ }
+-