Tue Jun 12 18:28:46 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

3 files changed, 2878 insertions, 0 deletions

diff --git a/TAO/tao/RTCORBA/diffs/RTCORBAC.cpp.diff b/TAO/tao/RTCORBA/diffs/RTCORBAC.cpp.diff
new file mode 100644
index 00000000000..6fca600699e
--- /dev/null
+++ b/TAO/tao/RTCORBA/diffs/RTCORBAC.cpp.diff
@@ -0,0 +1,988 @@
+--- orig/RTCORBAC.cpp	Tue Jun 12 17:56:16 2001
++++ RTCORBAC.cpp	Tue Jun 12 16:14:06 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,16 +19,18 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
++#define TAO_RTCORBA_SAFE_INCLUDE
+ #include "RTCORBAC.h"
++#undef TAO_RTCORBA_SAFE_INCLUDE
+ 
+ #include "tao/Stub.h"
+ #include "tao/Invocation.h"
+-#include "tao/PortableInterceptor.h"
++
++#include "tao/TAOS.h"
++#include "tao/Typecode.h"
+ 
+ #if TAO_HAS_INTERCEPTORS == 1
+ #include "tao/RequestInfo_Util.h"
+-#include "tao/ClientRequestInfo.h"
+-#include "tao/ClientInterceptorAdapter.h"
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+ 
+ #if defined (__BORLANDC__)
+@@ -227,9 +229,9 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadpoolLane, &_tc_TAO_tc_RTCORBA_ThreadpoolLane)
+ TAO_NAMESPACE_END
+ 
+-void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer)
++void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *x)
+ {
+-  ThreadpoolLane *tmp = ACE_static_cast (ThreadpoolLane*, _tao_void_pointer);
++  ThreadpoolLane *tmp = ACE_static_cast (ThreadpoolLane*,x);
+   delete tmp;
+ }
+ 
+@@ -320,9 +322,9 @@
+ {}
+ RTCORBA::ThreadpoolLanes::~ThreadpoolLanes (void) // dtor
+ {}
+-void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *_tao_void_pointer)
++void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *x)
+ {
+-  ThreadpoolLanes *tmp = ACE_static_cast (ThreadpoolLanes*, _tao_void_pointer);
++  ThreadpoolLanes *tmp = ACE_static_cast (ThreadpoolLanes*,x);
+   delete tmp;
+ }
+ 
+@@ -478,48 +480,6 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityModel, &_tc_TAO_tc_RTCORBA_PriorityModel)
+ TAO_NAMESPACE_END
+ 
+-RTCORBA::PriorityModelPolicy_ptr
+-tao_RTCORBA_PriorityModelPolicy_duplicate (
+-    RTCORBA::PriorityModelPolicy_ptr p
+-  )
+-{
+-  return RTCORBA::PriorityModelPolicy::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_PriorityModelPolicy_release (
+-    RTCORBA::PriorityModelPolicy_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::PriorityModelPolicy_ptr
+-tao_RTCORBA_PriorityModelPolicy_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::PriorityModelPolicy::_nil ();
+-}
+-
+-RTCORBA::PriorityModelPolicy_ptr
+-tao_RTCORBA_PriorityModelPolicy_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::PriorityModelPolicy::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_PriorityModelPolicy_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::PriorityModelPolicy **tmp =
+-    ACE_static_cast (RTCORBA::PriorityModelPolicy **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::PriorityModelPolicy_var
+@@ -643,9 +603,8 @@
+     ACE_static_cast (PriorityModelPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::PriorityModelPolicy_out
++// Inline operations for class RTCORBA::PriorityModelPolicy_out
+ // *************************************************************
+ 
+ RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_ptr &p)
+@@ -788,48 +747,6 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 41U)
+ TAO_NAMESPACE_END
+-RTCORBA::ThreadpoolPolicy_ptr
+-tao_RTCORBA_ThreadpoolPolicy_duplicate (
+-    RTCORBA::ThreadpoolPolicy_ptr p
+-  )
+-{
+-  return RTCORBA::ThreadpoolPolicy::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_ThreadpoolPolicy_release (
+-    RTCORBA::ThreadpoolPolicy_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::ThreadpoolPolicy_ptr
+-tao_RTCORBA_ThreadpoolPolicy_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::ThreadpoolPolicy::_nil ();
+-}
+-
+-RTCORBA::ThreadpoolPolicy_ptr
+-tao_RTCORBA_ThreadpoolPolicy_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::ThreadpoolPolicy::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_ThreadpoolPolicy_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::ThreadpoolPolicy **tmp =
+-    ACE_static_cast (RTCORBA::ThreadpoolPolicy **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::ThreadpoolPolicy_var
+@@ -953,9 +870,8 @@
+     ACE_static_cast (ThreadpoolPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::ThreadpoolPolicy_out
++// Inline operations for class RTCORBA::ThreadpoolPolicy_out
+ // *************************************************************
+ 
+ RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p)
+@@ -1094,48 +1010,6 @@
+   return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0";
+ }
+ 
+-RTCORBA::ProtocolProperties_ptr
+-tao_RTCORBA_ProtocolProperties_duplicate (
+-    RTCORBA::ProtocolProperties_ptr p
+-  )
+-{
+-  return RTCORBA::ProtocolProperties::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_ProtocolProperties_release (
+-    RTCORBA::ProtocolProperties_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::ProtocolProperties_ptr
+-tao_RTCORBA_ProtocolProperties_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::ProtocolProperties::_nil ();
+-}
+-
+-RTCORBA::ProtocolProperties_ptr
+-tao_RTCORBA_ProtocolProperties_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::ProtocolProperties::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_ProtocolProperties_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::ProtocolProperties **tmp =
+-    ACE_static_cast (RTCORBA::ProtocolProperties **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::ProtocolProperties_var
+@@ -1259,9 +1133,8 @@
+     ACE_static_cast (ProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::ProtocolProperties_out
++// Inline operations for class RTCORBA::ProtocolProperties_out
+ // *************************************************************
+ 
+ RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
+@@ -1475,9 +1348,9 @@
+ {}
+ RTCORBA::ProtocolList::~ProtocolList (void) // dtor
+ {}
+-void RTCORBA::ProtocolList::_tao_any_destructor (void *_tao_void_pointer)
++void RTCORBA::ProtocolList::_tao_any_destructor (void *x)
+ {
+-  ProtocolList *tmp = ACE_static_cast (ProtocolList*, _tao_void_pointer);
++  ProtocolList *tmp = ACE_static_cast (ProtocolList*,x);
+   delete tmp;
+ }
+ 
+@@ -1488,48 +1361,6 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 42U)
+ TAO_NAMESPACE_END
+-RTCORBA::ServerProtocolPolicy_ptr
+-tao_RTCORBA_ServerProtocolPolicy_duplicate (
+-    RTCORBA::ServerProtocolPolicy_ptr p
+-  )
+-{
+-  return RTCORBA::ServerProtocolPolicy::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_ServerProtocolPolicy_release (
+-    RTCORBA::ServerProtocolPolicy_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::ServerProtocolPolicy_ptr
+-tao_RTCORBA_ServerProtocolPolicy_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::ServerProtocolPolicy::_nil ();
+-}
+-
+-RTCORBA::ServerProtocolPolicy_ptr
+-tao_RTCORBA_ServerProtocolPolicy_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::ServerProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_ServerProtocolPolicy_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::ServerProtocolPolicy **tmp =
+-    ACE_static_cast (RTCORBA::ServerProtocolPolicy **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::ServerProtocolPolicy_var
+@@ -1653,9 +1484,8 @@
+     ACE_static_cast (ServerProtocolPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::ServerProtocolPolicy_out
++// Inline operations for class RTCORBA::ServerProtocolPolicy_out
+ // *************************************************************
+ 
+ RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
+@@ -1798,48 +1628,6 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 43U)
+ TAO_NAMESPACE_END
+-RTCORBA::ClientProtocolPolicy_ptr
+-tao_RTCORBA_ClientProtocolPolicy_duplicate (
+-    RTCORBA::ClientProtocolPolicy_ptr p
+-  )
+-{
+-  return RTCORBA::ClientProtocolPolicy::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_ClientProtocolPolicy_release (
+-    RTCORBA::ClientProtocolPolicy_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::ClientProtocolPolicy_ptr
+-tao_RTCORBA_ClientProtocolPolicy_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::ClientProtocolPolicy::_nil ();
+-}
+-
+-RTCORBA::ClientProtocolPolicy_ptr
+-tao_RTCORBA_ClientProtocolPolicy_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::ClientProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_ClientProtocolPolicy_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::ClientProtocolPolicy **tmp =
+-    ACE_static_cast (RTCORBA::ClientProtocolPolicy **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::ClientProtocolPolicy_var
+@@ -1963,9 +1751,8 @@
+     ACE_static_cast (ClientProtocolPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::ClientProtocolPolicy_out
++// Inline operations for class RTCORBA::ClientProtocolPolicy_out
+ // *************************************************************
+ 
+ RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
+@@ -2108,48 +1895,6 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 44U)
+ TAO_NAMESPACE_END
+-RTCORBA::PrivateConnectionPolicy_ptr
+-tao_RTCORBA_PrivateConnectionPolicy_duplicate (
+-    RTCORBA::PrivateConnectionPolicy_ptr p
+-  )
+-{
+-  return RTCORBA::PrivateConnectionPolicy::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_PrivateConnectionPolicy_release (
+-    RTCORBA::PrivateConnectionPolicy_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::PrivateConnectionPolicy_ptr
+-tao_RTCORBA_PrivateConnectionPolicy_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::PrivateConnectionPolicy::_nil ();
+-}
+-
+-RTCORBA::PrivateConnectionPolicy_ptr
+-tao_RTCORBA_PrivateConnectionPolicy_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::PrivateConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_PrivateConnectionPolicy_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::PrivateConnectionPolicy **tmp =
+-    ACE_static_cast (RTCORBA::PrivateConnectionPolicy **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::PrivateConnectionPolicy_var
+@@ -2273,9 +2018,8 @@
+     ACE_static_cast (PrivateConnectionPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::PrivateConnectionPolicy_out
++// Inline operations for class RTCORBA::PrivateConnectionPolicy_out
+ // *************************************************************
+ 
+ RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
+@@ -2414,49 +2158,6 @@
+   return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
+ }
+ 
+-RTCORBA::TCPProtocolProperties_ptr
+-tao_RTCORBA_TCPProtocolProperties_duplicate (
+-    RTCORBA::TCPProtocolProperties_ptr p
+-  )
+-{
+-  return RTCORBA::TCPProtocolProperties::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_TCPProtocolProperties_release (
+-    RTCORBA::TCPProtocolProperties_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::TCPProtocolProperties_ptr
+-tao_RTCORBA_TCPProtocolProperties_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::TCPProtocolProperties::_nil ();
+-}
+-
+-RTCORBA::TCPProtocolProperties_ptr
+-tao_RTCORBA_TCPProtocolProperties_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::TCPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_TCPProtocolProperties_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::TCPProtocolProperties **tmp =
+-    ACE_static_cast (RTCORBA::TCPProtocolProperties **, src);
+-  return *tmp;
+-}
+-
+ // *************************************************************
+ // Operations for class RTCORBA::TCPProtocolProperties_var
+ // *************************************************************
+@@ -2579,9 +2280,8 @@
+     ACE_static_cast (TCPProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::TCPProtocolProperties_out
++// Inline operations for class RTCORBA::TCPProtocolProperties_out
+ // *************************************************************
+ 
+ RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_ptr &p)
+@@ -2640,6 +2340,21 @@
+ }
+ 
+ 
++//////////////////////////////////////////////////////
++// CDR Encoding Support
++
++CORBA::Boolean
++RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
++{
++  return 1;
++}
++
++CORBA::Boolean
++RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
++{
++  return 1;
++}
++
+ // default constructor
+ RTCORBA::TCPProtocolProperties::TCPProtocolProperties ()
+ {
+@@ -2720,48 +2435,6 @@
+   return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0";
+ }
+ 
+-RTCORBA::GIOPProtocolProperties_ptr
+-tao_RTCORBA_GIOPProtocolProperties_duplicate (
+-    RTCORBA::GIOPProtocolProperties_ptr p
+-  )
+-{
+-  return RTCORBA::GIOPProtocolProperties::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_GIOPProtocolProperties_release (
+-    RTCORBA::GIOPProtocolProperties_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::GIOPProtocolProperties_ptr
+-tao_RTCORBA_GIOPProtocolProperties_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::GIOPProtocolProperties::_nil ();
+-}
+-
+-RTCORBA::GIOPProtocolProperties_ptr
+-tao_RTCORBA_GIOPProtocolProperties_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::GIOPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_GIOPProtocolProperties_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::GIOPProtocolProperties **tmp =
+-    ACE_static_cast (RTCORBA::GIOPProtocolProperties **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::GIOPProtocolProperties_var
+@@ -2885,9 +2558,8 @@
+     ACE_static_cast (GIOPProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::GIOPProtocolProperties_out
++// Inline operations for class RTCORBA::GIOPProtocolProperties_out
+ // *************************************************************
+ 
+ RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &p)
+@@ -3026,48 +2698,6 @@
+   return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0";
+ }
+ 
+-RTCORBA::UnixDomainProtocolProperties_ptr
+-tao_RTCORBA_UnixDomainProtocolProperties_duplicate (
+-    RTCORBA::UnixDomainProtocolProperties_ptr p
+-  )
+-{
+-  return RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_UnixDomainProtocolProperties_release (
+-    RTCORBA::UnixDomainProtocolProperties_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::UnixDomainProtocolProperties_ptr
+-tao_RTCORBA_UnixDomainProtocolProperties_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::UnixDomainProtocolProperties::_nil ();
+-}
+-
+-RTCORBA::UnixDomainProtocolProperties_ptr
+-tao_RTCORBA_UnixDomainProtocolProperties_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::UnixDomainProtocolProperties::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_UnixDomainProtocolProperties_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::UnixDomainProtocolProperties **tmp =
+-    ACE_static_cast (RTCORBA::UnixDomainProtocolProperties **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::UnixDomainProtocolProperties_var
+@@ -3191,9 +2821,8 @@
+     ACE_static_cast (UnixDomainProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::UnixDomainProtocolProperties_out
++// Inline operations for class RTCORBA::UnixDomainProtocolProperties_out
+ // *************************************************************
+ 
+ RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p)
+@@ -3332,48 +2961,6 @@
+   return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0";
+ }
+ 
+-RTCORBA::SharedMemoryProtocolProperties_ptr
+-tao_RTCORBA_SharedMemoryProtocolProperties_duplicate (
+-    RTCORBA::SharedMemoryProtocolProperties_ptr p
+-  )
+-{
+-  return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_SharedMemoryProtocolProperties_release (
+-    RTCORBA::SharedMemoryProtocolProperties_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::SharedMemoryProtocolProperties_ptr
+-tao_RTCORBA_SharedMemoryProtocolProperties_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::SharedMemoryProtocolProperties::_nil ();
+-}
+-
+-RTCORBA::SharedMemoryProtocolProperties_ptr
+-tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_SharedMemoryProtocolProperties_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::SharedMemoryProtocolProperties **tmp =
+-    ACE_static_cast (RTCORBA::SharedMemoryProtocolProperties **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::SharedMemoryProtocolProperties_var
+@@ -3497,9 +3084,8 @@
+     ACE_static_cast (SharedMemoryProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::SharedMemoryProtocolProperties_out
++// Inline operations for class RTCORBA::SharedMemoryProtocolProperties_out
+ // *************************************************************
+ 
+ RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p)
+@@ -3718,9 +3304,9 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBand, &_tc_TAO_tc_RTCORBA_PriorityBand)
+ TAO_NAMESPACE_END
+ 
+-void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer)
++void RTCORBA::PriorityBand::_tao_any_destructor (void *x)
+ {
+-  PriorityBand *tmp = ACE_static_cast (PriorityBand*, _tao_void_pointer);
++  PriorityBand *tmp = ACE_static_cast (PriorityBand*,x);
+   delete tmp;
+ }
+ 
+@@ -3811,9 +3397,9 @@
+ {}
+ RTCORBA::PriorityBands::~PriorityBands (void) // dtor
+ {}
+-void RTCORBA::PriorityBands::_tao_any_destructor (void *_tao_void_pointer)
++void RTCORBA::PriorityBands::_tao_any_destructor (void *x)
+ {
+-  PriorityBands *tmp = ACE_static_cast (PriorityBands*, _tao_void_pointer);
++  PriorityBands *tmp = ACE_static_cast (PriorityBands*,x);
+   delete tmp;
+ }
+ 
+@@ -3929,48 +3515,6 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 45U)
+ TAO_NAMESPACE_END
+-RTCORBA::PriorityBandedConnectionPolicy_ptr
+-tao_RTCORBA_PriorityBandedConnectionPolicy_duplicate (
+-    RTCORBA::PriorityBandedConnectionPolicy_ptr p
+-  )
+-{
+-  return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_PriorityBandedConnectionPolicy_release (
+-    RTCORBA::PriorityBandedConnectionPolicy_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::PriorityBandedConnectionPolicy_ptr
+-tao_RTCORBA_PriorityBandedConnectionPolicy_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+-}
+-
+-RTCORBA::PriorityBandedConnectionPolicy_ptr
+-tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_PriorityBandedConnectionPolicy_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::PriorityBandedConnectionPolicy **tmp =
+-    ACE_static_cast (RTCORBA::PriorityBandedConnectionPolicy **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::PriorityBandedConnectionPolicy_var
+@@ -4094,9 +3638,8 @@
+     ACE_static_cast (PriorityBandedConnectionPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::PriorityBandedConnectionPolicy_out
++// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_out
+ // *************************************************************
+ 
+ RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
+@@ -4235,48 +3778,6 @@
+   return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
+ }
+ 
+-RTCORBA::Current_ptr
+-tao_RTCORBA_Current_duplicate (
+-    RTCORBA::Current_ptr p
+-  )
+-{
+-  return RTCORBA::Current::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_Current_release (
+-    RTCORBA::Current_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::Current_ptr
+-tao_RTCORBA_Current_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::Current::_nil ();
+-}
+-
+-RTCORBA::Current_ptr
+-tao_RTCORBA_Current_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::Current::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_Current_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::Current **tmp =
+-    ACE_static_cast (RTCORBA::Current **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::Current_var
+@@ -4400,9 +3901,8 @@
+     ACE_static_cast (Current **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::Current_out
++// Inline operations for class RTCORBA::Current_out
+ // *************************************************************
+ 
+ RTCORBA::Current_out::Current_out (Current_ptr &p)
+@@ -4541,48 +4041,6 @@
+   return "IDL:omg.org/RTCORBA/Current:1.0";
+ }
+ 
+-RTCORBA::Mutex_ptr
+-tao_RTCORBA_Mutex_duplicate (
+-    RTCORBA::Mutex_ptr p
+-  )
+-{
+-  return RTCORBA::Mutex::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_Mutex_release (
+-    RTCORBA::Mutex_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::Mutex_ptr
+-tao_RTCORBA_Mutex_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::Mutex::_nil ();
+-}
+-
+-RTCORBA::Mutex_ptr
+-tao_RTCORBA_Mutex_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::Mutex::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_Mutex_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::Mutex **tmp =
+-    ACE_static_cast (RTCORBA::Mutex **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::Mutex_var
+@@ -4706,9 +4164,8 @@
+     ACE_static_cast (Mutex **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::Mutex_out
++// Inline operations for class RTCORBA::Mutex_out
+ // *************************************************************
+ 
+ RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p)
+@@ -4835,48 +4292,6 @@
+   return "IDL:omg.org/RTCORBA/Mutex:1.0";
+ }
+ 
+-RTCORBA::RTORB_ptr
+-tao_RTCORBA_RTORB_duplicate (
+-    RTCORBA::RTORB_ptr p
+-  )
+-{
+-  return RTCORBA::RTORB::_duplicate (p);
+-}
+-
+-void
+-tao_RTCORBA_RTORB_release (
+-    RTCORBA::RTORB_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-RTCORBA::RTORB_ptr
+-tao_RTCORBA_RTORB_nil (
+-    void
+-  )
+-{
+-  return RTCORBA::RTORB::_nil ();
+-}
+-
+-RTCORBA::RTORB_ptr
+-tao_RTCORBA_RTORB_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return RTCORBA::RTORB::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-tao_RTCORBA_RTORB_upcast (
+-    void *src
+-  )
+-{
+-  RTCORBA::RTORB **tmp =
+-    ACE_static_cast (RTCORBA::RTORB **, src);
+-  return *tmp;
+-}
+ 
+ // *************************************************************
+ // Operations for class RTCORBA::RTORB_var
+@@ -5000,9 +4415,8 @@
+     ACE_static_cast (RTORB **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+-// Operations for class RTCORBA::RTORB_out
++// Inline operations for class RTCORBA::RTORB_out
+ // *************************************************************
+ 
+ RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p)
+@@ -5224,7 +4638,7 @@
+ 
+ // Narrow.
+ RTCORBA::RTORB::InvalidThreadpool *
+-RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *exc)
++RTCORBA::RTORB::InvalidThreadpool::_narrow (CORBA::Exception *exc)
+ {
+   if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ()))
+     {
+@@ -5782,11 +5196,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 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;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -5829,11 +5238,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 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;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBAC.h.diff b/TAO/tao/RTCORBA/diffs/RTCORBAC.h.diff
new file mode 100644
index 00000000000..32680ce026e
--- /dev/null
+++ b/TAO/tao/RTCORBA/diffs/RTCORBAC.h.diff
@@ -0,0 +1,1175 @@
+--- orig/RTCORBAC.h	Tue Jun 12 17:56:16 2001
++++ RTCORBAC.h	Tue Jun 12 16:14:06 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -23,15 +23,26 @@
+ #define _TAO_IDL_ORIG_RTCORBAC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "tao/orbconf.h"
++
++#include "rtcorba_export.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "rtcorba_export.h"
+-#include "IOPC.h"
+-#include "TimeBaseC.h"
++#include "tao/IOPC.h"
++#include "tao/PolicyC.h"
++#include "tao/TimeBaseC.h"
++
++#include "tao/Encodable.h"
++
++#include "Priority_Mapping_Manager.h"
++
++#ifndef TAO_RTCORBA_SAFE_INCLUDE
++#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
++#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
++
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+@@ -58,6 +69,13 @@
+ 
+ TAO_NAMESPACE  RTCORBA
+ {
++  // TAO-specific
++  typedef TAO_Priority_Mapping_Manager PriorityMappingManager;
++  typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr;
++  typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
++  typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out;
++  // End TAO-specific
++
+   typedef CORBA::Short NativePriority;
+   typedef CORBA::Short_out NativePriority_out;
+   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativePriority;
+@@ -70,6 +88,7 @@
+   
+   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short maxPriority;
+   
++  typedef TAO_Priority_Mapping PriorityMapping;
+   typedef CORBA::ULong ThreadpoolId;
+   typedef CORBA::ULong_out ThreadpoolId_out;
+   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolId;
+@@ -89,23 +108,20 @@
+     ACE_NESTED_CLASS (RTCORBA, Priority) lane_priority;
+     CORBA::ULong static_threads;
+     CORBA::ULong dynamic_threads;
+-    
+   };
+   
+   class TAO_RTCORBA_Export ThreadpoolLane_var
+   {
+   public:
+-    ThreadpoolLane_var (void);
++    ThreadpoolLane_var (void); // default constructor
+     ThreadpoolLane_var (ThreadpoolLane *);
+-    ThreadpoolLane_var (const ThreadpoolLane_var &);
+-    // Fixed-size types only.
+-    ThreadpoolLane_var (const ThreadpoolLane &);
+-    ~ThreadpoolLane_var (void);
++    ThreadpoolLane_var (const ThreadpoolLane_var &); // copy constructor
++    ThreadpoolLane_var (const ThreadpoolLane &); // fixed-size types only
++    ~ThreadpoolLane_var (void); // destructor
+     
+     ThreadpoolLane_var &operator= (ThreadpoolLane *);
+     ThreadpoolLane_var &operator= (const ThreadpoolLane_var &);
+-    // Fixed-size types only.
+-    ThreadpoolLane_var &operator= (const ThreadpoolLane &);
++    ThreadpoolLane_var &operator= (const ThreadpoolLane &); // fixed-size types only
+     ThreadpoolLane *operator-> (void);
+     const ThreadpoolLane *operator-> (void) const;
+     
+@@ -134,46 +150,36 @@
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_
+   
+-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
+-    : public TAO_Unbounded_Base_Sequence
++    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes : public TAO_Unbounded_Base_Sequence
+   {
+   public:
+     // = Initialization and termination methods.
+-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
++
++      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void); // Default constructor.
+     _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum); 
+-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
+-        CORBA::ULong maximum,
++      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum,
+         CORBA::ULong length,
+         ThreadpoolLane *data,
+-        CORBA::Boolean release = 0
+-      );
+-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
+-        const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
+-      );
+-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &operator= (
+-        const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
+-      );
+-    virtual ~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
+-    
++        CORBA::Boolean release = 0);
++      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs);
++      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &operator= (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs);
++      virtual ~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void); // Dtor.
+     // = Accessors.
+     ThreadpoolLane &operator[] (CORBA::ULong i);
+     const ThreadpoolLane &operator[] (CORBA::ULong i) const;
+-    
+     // = Static operations.
+     static ThreadpoolLane *allocbuf (CORBA::ULong size);
+     static void freebuf (ThreadpoolLane *buffer);
+-    
+-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
++      // Implement the TAO_Base_Sequence methods (see Sequence.h)
++
+     ThreadpoolLane *get_buffer (CORBA::Boolean orphan = 0);
+     const ThreadpoolLane *get_buffer (void) const;
+-    void replace (
+-        CORBA::ULong max,
++      void replace (CORBA::ULong max,
+         CORBA::ULong length,
+         ThreadpoolLane *data,
+-        CORBA::Boolean release
+-      );
++        CORBA::Boolean release);
+   };
+   
+ #endif /* end #if !defined */
+@@ -215,7 +221,6 @@
+     typedef ThreadpoolLanes_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+-    
+   };
+   
+ #endif /* end #if !defined */
+@@ -231,17 +236,15 @@
+   class TAO_RTCORBA_Export ThreadpoolLanes_var
+   {
+   public:
+-    ThreadpoolLanes_var (void);
++    ThreadpoolLanes_var (void); // default constructor
+     ThreadpoolLanes_var (ThreadpoolLanes *);
+-    ThreadpoolLanes_var (const ThreadpoolLanes_var &);
+-    // Fixed-size base types only.
+-    ThreadpoolLanes_var (const ThreadpoolLanes &);
+-    ~ThreadpoolLanes_var (void);
++    ThreadpoolLanes_var (const ThreadpoolLanes_var &); // copy constructor
++    ThreadpoolLanes_var (const ThreadpoolLanes &); // fixed-size base types only
++    ~ThreadpoolLanes_var (void); // destructor
+     
+     ThreadpoolLanes_var &operator= (ThreadpoolLanes *);
+     ThreadpoolLanes_var &operator= (const ThreadpoolLanes_var &);
+-    // Fixed-size base types only.
+-    ThreadpoolLanes_var &operator= (const ThreadpoolLanes &);
++    ThreadpoolLanes_var &operator= (const ThreadpoolLanes &); // fixed-size base types only
+     ThreadpoolLanes *operator-> (void);
+     const ThreadpoolLanes *operator-> (void) const;
+     
+@@ -285,7 +288,7 @@
+   
+   private:
+     ThreadpoolLanes *&ptr_;
+-    // Assignment from T_var not allowed.
++    // assignment from T_var not allowed
+     void operator= (const ThreadpoolLanes_var &);
+   };
+   
+@@ -301,7 +304,6 @@
+     CLIENT_PROPAGATED,
+     SERVER_DECLARED
+   };
+-  
+   typedef PriorityModel &PriorityModel_out;
+   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityModel;
+   
+@@ -344,10 +346,7 @@
+     static PriorityModelPolicy_ptr duplicate (PriorityModelPolicy_ptr);
+     static void release (PriorityModelPolicy_ptr);
+     static PriorityModelPolicy_ptr nil (void);
+-    static PriorityModelPolicy_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static PriorityModelPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -388,8 +387,7 @@
+ #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
+ #define _RTCORBA_PRIORITYMODELPOLICY_CH_
+   
+-  class TAO_RTCORBA_Export PriorityModelPolicy
+-    : public virtual CORBA::Policy
++class TAO_RTCORBA_Export PriorityModelPolicy: public virtual CORBA::Policy
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -399,19 +397,16 @@
+ 
+     // the static operations
+     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
+-    
+     static PriorityModelPolicy_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static PriorityModelPolicy_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static PriorityModelPolicy_ptr _nil (void)
+       {
+         return (PriorityModelPolicy_ptr)0;
+@@ -441,7 +436,6 @@
+     PriorityModelPolicy ();
+     
+     virtual ~PriorityModelPolicy (void);
+-  
+   private:
+     PriorityModelPolicy (const PriorityModelPolicy &);
+     void operator= (const PriorityModelPolicy &);
+@@ -491,10 +485,7 @@
+     static ThreadpoolPolicy_ptr duplicate (ThreadpoolPolicy_ptr);
+     static void release (ThreadpoolPolicy_ptr);
+     static ThreadpoolPolicy_ptr nil (void);
+-    static ThreadpoolPolicy_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static ThreadpoolPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -535,8 +526,7 @@
+ #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
+ #define _RTCORBA_THREADPOOLPOLICY_CH_
+   
+-  class TAO_RTCORBA_Export ThreadpoolPolicy
+-    : public virtual CORBA::Policy
++class TAO_RTCORBA_Export ThreadpoolPolicy: public virtual CORBA::Policy
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -546,19 +536,16 @@
+ 
+     // the static operations
+     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
+-    
+     static ThreadpoolPolicy_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ThreadpoolPolicy_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ThreadpoolPolicy_ptr _nil (void)
+       {
+         return (ThreadpoolPolicy_ptr)0;
+@@ -580,7 +567,6 @@
+     ThreadpoolPolicy ();
+     
+     virtual ~ThreadpoolPolicy (void);
+-  
+   private:
+     ThreadpoolPolicy (const ThreadpoolPolicy &);
+     void operator= (const ThreadpoolPolicy &);
+@@ -628,10 +614,7 @@
+     static ProtocolProperties_ptr duplicate (ProtocolProperties_ptr);
+     static void release (ProtocolProperties_ptr);
+     static ProtocolProperties_ptr nil (void);
+-    static ProtocolProperties_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static ProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -672,8 +655,8 @@
+ #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
+ #define _RTCORBA_PROTOCOLPROPERTIES_CH_
+   
+-  class TAO_RTCORBA_Export ProtocolProperties
+-    : public virtual CORBA_Object
++class TAO_RTCORBA_Export ProtocolProperties : public virtual CORBA_Object,
++                                      public TAO_Encodable
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -683,19 +666,16 @@
+ 
+     // the static operations
+     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
+-    
+     static ProtocolProperties_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ProtocolProperties_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ProtocolProperties_ptr _nil (void)
+       {
+         return (ProtocolProperties_ptr)0;
+@@ -705,11 +685,15 @@
+     
+     virtual const char* _interface_repository_id (void) const;
+ 
++    // CDR Encoder/Decoder methods.
++
++    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
++    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
++
+   protected:
+     ProtocolProperties ();
+     
+     virtual ~ProtocolProperties (void);
+-  
+   private:
+     ProtocolProperties (const ProtocolProperties &);
+     void operator= (const ProtocolProperties &);
+@@ -731,16 +715,15 @@
+     IOP::ProfileId protocol_type;
+     ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) orb_protocol_properties;
+     ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) transport_protocol_properties;
+-    
+   };
+   
+   class TAO_RTCORBA_Export Protocol_var
+   {
+   public:
+-    Protocol_var (void);
++    Protocol_var (void); // default constructor
+     Protocol_var (Protocol *);
+-    Protocol_var (const Protocol_var &);
+-    ~Protocol_var (void);
++    Protocol_var (const Protocol_var &); // copy constructor
++    ~Protocol_var (void); // destructor
+     
+     Protocol_var &operator= (Protocol *);
+     Protocol_var &operator= (const Protocol_var &);
+@@ -750,8 +733,7 @@
+     operator const Protocol &() const;
+     operator Protocol &();
+     operator Protocol &() const;
+-    // Variable-size types only.
+-    operator Protocol *&();
++    operator Protocol *&(); // variable-size types only
+     
+     // in, inout, out, _retn 
+     const Protocol &in (void) const;
+@@ -778,7 +760,7 @@
+     
+   private:
+     Protocol *&ptr_;
+-    // Assignment from T_var not allowed.
++    // assignment from T_var not allowed
+     void operator= (const Protocol_var &);
+   };
+   
+@@ -788,46 +770,36 @@
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_
+   
+-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
+-    : public TAO_Unbounded_Base_Sequence
++    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList : public TAO_Unbounded_Base_Sequence
+   {
+   public:
+     // = Initialization and termination methods.
+-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
++
++      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); // Default constructor.
+     _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum); 
+-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
+-        CORBA::ULong maximum,
++      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum,
+         CORBA::ULong length,
+         Protocol *data,
+-        CORBA::Boolean release = 0
+-      );
+-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
+-        const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
+-      );
+-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &operator= (
+-        const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
+-      );
+-    virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
+-    
++        CORBA::Boolean release = 0);
++      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs);
++      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs);
++      virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); // Dtor.
+     // = Accessors.
+     Protocol &operator[] (CORBA::ULong i);
+     const Protocol &operator[] (CORBA::ULong i) const;
+-    
+     // = Static operations.
+     static Protocol *allocbuf (CORBA::ULong size);
+     static void freebuf (Protocol *buffer);
+-    
+-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
++      // Implement the TAO_Base_Sequence methods (see Sequence.h)
++
+     Protocol *get_buffer (CORBA::Boolean orphan = 0);
+     const Protocol *get_buffer (void) const;
+-    void replace (
+-        CORBA::ULong max,
++      void replace (CORBA::ULong max,
+         CORBA::ULong length,
+         Protocol *data,
+-        CORBA::Boolean release
+-      );
++        CORBA::Boolean release);
+   };
+   
+ #endif /* end #if !defined */
+@@ -869,7 +841,6 @@
+     typedef ProtocolList_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+-    
+   };
+   
+ #endif /* end #if !defined */
+@@ -885,10 +856,10 @@
+   class TAO_RTCORBA_Export ProtocolList_var
+   {
+   public:
+-    ProtocolList_var (void);
++    ProtocolList_var (void); // default constructor
+     ProtocolList_var (ProtocolList *);
+-    ProtocolList_var (const ProtocolList_var &);
+-    ~ProtocolList_var (void);
++    ProtocolList_var (const ProtocolList_var &); // copy constructor
++    ~ProtocolList_var (void); // destructor
+     
+     ProtocolList_var &operator= (ProtocolList *);
+     ProtocolList_var &operator= (const ProtocolList_var &);
+@@ -936,7 +907,7 @@
+   
+   private:
+     ProtocolList *&ptr_;
+-    // Assignment from T_var not allowed.
++    // assignment from T_var not allowed
+     void operator= (const ProtocolList_var &);
+   };
+   
+@@ -984,10 +955,7 @@
+     static ServerProtocolPolicy_ptr duplicate (ServerProtocolPolicy_ptr);
+     static void release (ServerProtocolPolicy_ptr);
+     static ServerProtocolPolicy_ptr nil (void);
+-    static ServerProtocolPolicy_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static ServerProtocolPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1028,8 +996,7 @@
+ #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
+ #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
+   
+-  class TAO_RTCORBA_Export ServerProtocolPolicy
+-    : public virtual CORBA::Policy
++class TAO_RTCORBA_Export ServerProtocolPolicy: public virtual CORBA::Policy
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1039,19 +1006,16 @@
+ 
+     // the static operations
+     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
+-    
+     static ServerProtocolPolicy_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ServerProtocolPolicy_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ServerProtocolPolicy_ptr _nil (void)
+       {
+         return (ServerProtocolPolicy_ptr)0;
+@@ -1073,7 +1037,6 @@
+     ServerProtocolPolicy ();
+     
+     virtual ~ServerProtocolPolicy (void);
+-  
+   private:
+     ServerProtocolPolicy (const ServerProtocolPolicy &);
+     void operator= (const ServerProtocolPolicy &);
+@@ -1123,10 +1086,7 @@
+     static ClientProtocolPolicy_ptr duplicate (ClientProtocolPolicy_ptr);
+     static void release (ClientProtocolPolicy_ptr);
+     static ClientProtocolPolicy_ptr nil (void);
+-    static ClientProtocolPolicy_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static ClientProtocolPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1167,8 +1127,7 @@
+ #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
+ #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
+   
+-  class TAO_RTCORBA_Export ClientProtocolPolicy
+-    : public virtual CORBA::Policy
++class TAO_RTCORBA_Export ClientProtocolPolicy: public virtual CORBA::Policy
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1178,19 +1137,16 @@
+ 
+     // the static operations
+     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
+-    
+     static ClientProtocolPolicy_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ClientProtocolPolicy_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static ClientProtocolPolicy_ptr _nil (void)
+       {
+         return (ClientProtocolPolicy_ptr)0;
+@@ -1212,7 +1168,6 @@
+     ClientProtocolPolicy ();
+     
+     virtual ~ClientProtocolPolicy (void);
+-  
+   private:
+     ClientProtocolPolicy (const ClientProtocolPolicy &);
+     void operator= (const ClientProtocolPolicy &);
+@@ -1262,10 +1217,7 @@
+     static PrivateConnectionPolicy_ptr duplicate (PrivateConnectionPolicy_ptr);
+     static void release (PrivateConnectionPolicy_ptr);
+     static PrivateConnectionPolicy_ptr nil (void);
+-    static PrivateConnectionPolicy_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static PrivateConnectionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1306,8 +1258,7 @@
+ #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
+ #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
+   
+-  class TAO_RTCORBA_Export PrivateConnectionPolicy
+-    : public virtual CORBA::Policy
++class TAO_RTCORBA_Export PrivateConnectionPolicy: public virtual CORBA::Policy
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1317,19 +1268,16 @@
+ 
+     // the static operations
+     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
+-    
+     static PrivateConnectionPolicy_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static PrivateConnectionPolicy_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static PrivateConnectionPolicy_ptr _nil (void)
+       {
+         return (PrivateConnectionPolicy_ptr)0;
+@@ -1343,7 +1291,6 @@
+     PrivateConnectionPolicy ();
+     
+     virtual ~PrivateConnectionPolicy (void);
+-  
+   private:
+     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
+     void operator= (const PrivateConnectionPolicy &);
+@@ -1391,10 +1338,7 @@
+     static TCPProtocolProperties_ptr duplicate (TCPProtocolProperties_ptr);
+     static void release (TCPProtocolProperties_ptr);
+     static TCPProtocolProperties_ptr nil (void);
+-    static TCPProtocolProperties_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static TCPProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1435,8 +1379,7 @@
+ #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
+ #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
+   
+-  class TAO_RTCORBA_Export TCPProtocolProperties
+-    : public virtual ProtocolProperties
++class TAO_RTCORBA_Export TCPProtocolProperties: public virtual ProtocolProperties
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1446,19 +1389,16 @@
+ 
+     // the static operations
+     static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
+-    
+     static TCPProtocolProperties_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static TCPProtocolProperties_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static TCPProtocolProperties_ptr _nil (void)
+       {
+         return (TCPProtocolProperties_ptr)0;
+@@ -1557,7 +1497,6 @@
+     TCPProtocolProperties ();
+     
+     virtual ~TCPProtocolProperties (void);
+-  
+   private:
+     TCPProtocolProperties (const TCPProtocolProperties &);
+     void operator= (const TCPProtocolProperties &);
+@@ -1605,10 +1544,7 @@
+     static GIOPProtocolProperties_ptr duplicate (GIOPProtocolProperties_ptr);
+     static void release (GIOPProtocolProperties_ptr);
+     static GIOPProtocolProperties_ptr nil (void);
+-    static GIOPProtocolProperties_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static GIOPProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1649,8 +1585,7 @@
+ #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
+ #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
+   
+-  class TAO_RTCORBA_Export GIOPProtocolProperties
+-    : public virtual ProtocolProperties
++class TAO_RTCORBA_Export GIOPProtocolProperties: public virtual ProtocolProperties
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1660,19 +1595,16 @@
+ 
+     // the static operations
+     static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
+-    
+     static GIOPProtocolProperties_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static GIOPProtocolProperties_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static GIOPProtocolProperties_ptr _nil (void)
+       {
+         return (GIOPProtocolProperties_ptr)0;
+@@ -1686,7 +1618,6 @@
+     GIOPProtocolProperties ();
+     
+     virtual ~GIOPProtocolProperties (void);
+-  
+   private:
+     GIOPProtocolProperties (const GIOPProtocolProperties &);
+     void operator= (const GIOPProtocolProperties &);
+@@ -1734,10 +1665,7 @@
+     static UnixDomainProtocolProperties_ptr duplicate (UnixDomainProtocolProperties_ptr);
+     static void release (UnixDomainProtocolProperties_ptr);
+     static UnixDomainProtocolProperties_ptr nil (void);
+-    static UnixDomainProtocolProperties_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static UnixDomainProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1778,8 +1706,7 @@
+ #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
+ #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
+   
+-  class TAO_RTCORBA_Export UnixDomainProtocolProperties
+-    : public virtual ProtocolProperties
++class TAO_RTCORBA_Export UnixDomainProtocolProperties: public virtual ProtocolProperties
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1789,19 +1716,16 @@
+ 
+     // the static operations
+     static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
+-    
+     static UnixDomainProtocolProperties_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static UnixDomainProtocolProperties_ptr _nil (void)
+       {
+         return (UnixDomainProtocolProperties_ptr)0;
+@@ -1849,7 +1773,6 @@
+     UnixDomainProtocolProperties ();
+     
+     virtual ~UnixDomainProtocolProperties (void);
+-  
+   private:
+     UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
+     void operator= (const UnixDomainProtocolProperties &);
+@@ -1897,10 +1820,7 @@
+     static SharedMemoryProtocolProperties_ptr duplicate (SharedMemoryProtocolProperties_ptr);
+     static void release (SharedMemoryProtocolProperties_ptr);
+     static SharedMemoryProtocolProperties_ptr nil (void);
+-    static SharedMemoryProtocolProperties_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static SharedMemoryProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -1941,8 +1861,7 @@
+ #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
+ #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
+   
+-  class TAO_RTCORBA_Export SharedMemoryProtocolProperties
+-    : public virtual ProtocolProperties
++class TAO_RTCORBA_Export SharedMemoryProtocolProperties: public virtual ProtocolProperties
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -1952,19 +1871,16 @@
+ 
+     // the static operations
+     static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
+-    
+     static SharedMemoryProtocolProperties_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static SharedMemoryProtocolProperties_ptr _nil (void)
+       {
+         return (SharedMemoryProtocolProperties_ptr)0;
+@@ -2029,7 +1945,6 @@
+     SharedMemoryProtocolProperties ();
+     
+     virtual ~SharedMemoryProtocolProperties (void);
+-  
+   private:
+     SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
+     void operator= (const SharedMemoryProtocolProperties &);
+@@ -2052,23 +1967,20 @@
+     
+     ACE_NESTED_CLASS (RTCORBA, Priority) low;
+     ACE_NESTED_CLASS (RTCORBA, Priority) high;
+-    
+   };
+   
+   class TAO_RTCORBA_Export PriorityBand_var
+   {
+   public:
+-    PriorityBand_var (void);
++    PriorityBand_var (void); // default constructor
+     PriorityBand_var (PriorityBand *);
+-    PriorityBand_var (const PriorityBand_var &);
+-    // Fixed-size types only.
+-    PriorityBand_var (const PriorityBand &);
+-    ~PriorityBand_var (void);
++    PriorityBand_var (const PriorityBand_var &); // copy constructor
++    PriorityBand_var (const PriorityBand &); // fixed-size types only
++    ~PriorityBand_var (void); // destructor
+     
+     PriorityBand_var &operator= (PriorityBand *);
+     PriorityBand_var &operator= (const PriorityBand_var &);
+-    // Fixed-size types only.
+-    PriorityBand_var &operator= (const PriorityBand &);
++    PriorityBand_var &operator= (const PriorityBand &); // fixed-size types only
+     PriorityBand *operator-> (void);
+     const PriorityBand *operator-> (void) const;
+     
+@@ -2097,46 +2009,36 @@
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_
+   
+-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
+-    : public TAO_Unbounded_Base_Sequence
++    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands : public TAO_Unbounded_Base_Sequence
+   {
+   public:
+     // = Initialization and termination methods.
+-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
++
++      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); // Default constructor.
+     _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum); 
+-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
+-        CORBA::ULong maximum,
++      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum,
+         CORBA::ULong length,
+         PriorityBand *data,
+-        CORBA::Boolean release = 0
+-      );
+-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
+-        const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
+-      );
+-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &operator= (
+-        const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
+-      );
+-    virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
+-    
++        CORBA::Boolean release = 0);
++      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs);
++      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs);
++      virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); // Dtor.
+     // = Accessors.
+     PriorityBand &operator[] (CORBA::ULong i);
+     const PriorityBand &operator[] (CORBA::ULong i) const;
+-    
+     // = Static operations.
+     static PriorityBand *allocbuf (CORBA::ULong size);
+     static void freebuf (PriorityBand *buffer);
+-    
+-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
++      // Implement the TAO_Base_Sequence methods (see Sequence.h)
++
+     PriorityBand *get_buffer (CORBA::Boolean orphan = 0);
+     const PriorityBand *get_buffer (void) const;
+-    void replace (
+-        CORBA::ULong max,
++      void replace (CORBA::ULong max,
+         CORBA::ULong length,
+         PriorityBand *data,
+-        CORBA::Boolean release
+-      );
++        CORBA::Boolean release);
+   };
+   
+ #endif /* end #if !defined */
+@@ -2178,7 +2080,6 @@
+     typedef PriorityBands_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+-    
+   };
+   
+ #endif /* end #if !defined */
+@@ -2194,17 +2095,15 @@
+   class TAO_RTCORBA_Export PriorityBands_var
+   {
+   public:
+-    PriorityBands_var (void);
++    PriorityBands_var (void); // default constructor
+     PriorityBands_var (PriorityBands *);
+-    PriorityBands_var (const PriorityBands_var &);
+-    // Fixed-size base types only.
+-    PriorityBands_var (const PriorityBands &);
+-    ~PriorityBands_var (void);
++    PriorityBands_var (const PriorityBands_var &); // copy constructor
++    PriorityBands_var (const PriorityBands &); // fixed-size base types only
++    ~PriorityBands_var (void); // destructor
+     
+     PriorityBands_var &operator= (PriorityBands *);
+     PriorityBands_var &operator= (const PriorityBands_var &);
+-    // Fixed-size base types only.
+-    PriorityBands_var &operator= (const PriorityBands &);
++    PriorityBands_var &operator= (const PriorityBands &); // fixed-size base types only
+     PriorityBands *operator-> (void);
+     const PriorityBands *operator-> (void) const;
+     
+@@ -2248,7 +2147,7 @@
+   
+   private:
+     PriorityBands *&ptr_;
+-    // Assignment from T_var not allowed.
++    // assignment from T_var not allowed
+     void operator= (const PriorityBands_var &);
+   };
+   
+@@ -2298,10 +2197,7 @@
+     static PriorityBandedConnectionPolicy_ptr duplicate (PriorityBandedConnectionPolicy_ptr);
+     static void release (PriorityBandedConnectionPolicy_ptr);
+     static PriorityBandedConnectionPolicy_ptr nil (void);
+-    static PriorityBandedConnectionPolicy_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static PriorityBandedConnectionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -2342,8 +2238,7 @@
+ #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
+ #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
+   
+-  class TAO_RTCORBA_Export PriorityBandedConnectionPolicy
+-    : public virtual CORBA::Policy
++class TAO_RTCORBA_Export PriorityBandedConnectionPolicy: public virtual CORBA::Policy
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -2353,19 +2248,16 @@
+ 
+     // the static operations
+     static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
+-    
+     static PriorityBandedConnectionPolicy_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static PriorityBandedConnectionPolicy_ptr _nil (void)
+       {
+         return (PriorityBandedConnectionPolicy_ptr)0;
+@@ -2387,7 +2279,6 @@
+     PriorityBandedConnectionPolicy ();
+     
+     virtual ~PriorityBandedConnectionPolicy (void);
+-  
+   private:
+     PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
+     void operator= (const PriorityBandedConnectionPolicy &);
+@@ -2435,10 +2326,7 @@
+     static Current_ptr duplicate (Current_ptr);
+     static void release (Current_ptr);
+     static Current_ptr nil (void);
+-    static Current_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -2479,8 +2367,7 @@
+ #if !defined (_RTCORBA_CURRENT_CH_)
+ #define _RTCORBA_CURRENT_CH_
+   
+-  class TAO_RTCORBA_Export Current
+-    : public virtual CORBA::Current
++class TAO_RTCORBA_Export Current: public virtual CORBA::Current
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -2490,19 +2377,16 @@
+ 
+     // the static operations
+     static Current_ptr _duplicate (Current_ptr obj);
+-    
+     static Current_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static Current_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static Current_ptr _nil (void)
+       {
+         return (Current_ptr)0;
+@@ -2533,7 +2417,6 @@
+     Current ();
+     
+     virtual ~Current (void);
+-  
+   private:
+     Current (const Current &);
+     void operator= (const Current &);
+@@ -2581,10 +2464,7 @@
+     static Mutex_ptr duplicate (Mutex_ptr);
+     static void release (Mutex_ptr);
+     static Mutex_ptr nil (void);
+-    static Mutex_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static Mutex_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -2625,8 +2505,7 @@
+ #if !defined (_RTCORBA_MUTEX_CH_)
+ #define _RTCORBA_MUTEX_CH_
+   
+-  class TAO_RTCORBA_Export Mutex
+-    : public virtual CORBA_Object
++class TAO_RTCORBA_Export Mutex : public virtual CORBA_Object
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -2636,19 +2515,16 @@
+ 
+     // the static operations
+     static Mutex_ptr _duplicate (Mutex_ptr obj);
+-    
+     static Mutex_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static Mutex_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static Mutex_ptr _nil (void)
+       {
+         return (Mutex_ptr)0;
+@@ -2687,7 +2563,6 @@
+     Mutex ();
+     
+     virtual ~Mutex (void);
+-  
+   private:
+     Mutex (const Mutex &);
+     void operator= (const Mutex &);
+@@ -2735,10 +2610,7 @@
+     static RTORB_ptr duplicate (RTORB_ptr);
+     static void release (RTORB_ptr);
+     static RTORB_ptr nil (void);
+-    static RTORB_ptr narrow (
+-        CORBA::Object *,
+-        CORBA::Environment &
+-      );
++    static RTORB_ptr narrow (CORBA::Object *, CORBA::Environment &);
+     static CORBA::Object * upcast (void *);
+   
+   private:
+@@ -2779,8 +2651,7 @@
+ #if !defined (_RTCORBA_RTORB_CH_)
+ #define _RTCORBA_RTORB_CH_
+   
+-  class TAO_RTCORBA_Export RTORB
+-    : public virtual CORBA_Object
++class TAO_RTCORBA_Export RTORB : public virtual CORBA_Object
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -2790,19 +2661,16 @@
+ 
+     // the static operations
+     static RTORB_ptr _duplicate (RTORB_ptr obj);
+-    
+     static RTORB_ptr _narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static RTORB_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj,
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+       );
+-    
+     static RTORB_ptr _nil (void)
+       {
+         return (RTORB_ptr)0;
+@@ -2930,7 +2798,7 @@
+           CORBA::Environment &
+         );
+       
+-      static InvalidThreadpool *_downcast (CORBA::Exception *);
++      static InvalidThreadpool *_narrow (CORBA::Exception *);
+ 
+ 
+       // = TAO extension.
+@@ -3041,7 +2909,6 @@
+     RTORB ();
+     
+     virtual ~RTORB (void);
+-  
+   private:
+     RTORB (const RTORB &);
+     void operator= (const RTORB &);
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBAC.i.diff b/TAO/tao/RTCORBA/diffs/RTCORBAC.i.diff
new file mode 100644
index 00000000000..dfc6a105dda
--- /dev/null
+++ b/TAO/tao/RTCORBA/diffs/RTCORBAC.i.diff
@@ -0,0 +1,715 @@
+--- orig/RTCORBAC.i	Tue Jun 12 17:56:16 2001
++++ RTCORBAC.i	Tue Jun 12 16:14:06 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -574,6 +574,49 @@
+ #if !defined (_RTCORBA_PRIORITYMODELPOLICY___CI_)
+ #define _RTCORBA_PRIORITYMODELPOLICY___CI_
+ 
++ACE_INLINE RTCORBA::PriorityModelPolicy_ptr
++tao_RTCORBA_PriorityModelPolicy_duplicate (
++    RTCORBA::PriorityModelPolicy_ptr p
++  )
++{
++  return RTCORBA::PriorityModelPolicy::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_PriorityModelPolicy_release (
++    RTCORBA::PriorityModelPolicy_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::PriorityModelPolicy_ptr
++tao_RTCORBA_PriorityModelPolicy_nil (
++    void
++  )
++{
++  return RTCORBA::PriorityModelPolicy::_nil ();
++}
++
++ACE_INLINE RTCORBA::PriorityModelPolicy_ptr
++tao_RTCORBA_PriorityModelPolicy_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::PriorityModelPolicy::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_PriorityModelPolicy_upcast (
++    void *src
++  )
++{
++  RTCORBA::PriorityModelPolicy **tmp =
++    ACE_static_cast (RTCORBA::PriorityModelPolicy **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -581,6 +624,49 @@
+ #if !defined (_RTCORBA_THREADPOOLPOLICY___CI_)
+ #define _RTCORBA_THREADPOOLPOLICY___CI_
+ 
++ACE_INLINE RTCORBA::ThreadpoolPolicy_ptr
++tao_RTCORBA_ThreadpoolPolicy_duplicate (
++    RTCORBA::ThreadpoolPolicy_ptr p
++  )
++{
++  return RTCORBA::ThreadpoolPolicy::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_ThreadpoolPolicy_release (
++    RTCORBA::ThreadpoolPolicy_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::ThreadpoolPolicy_ptr
++tao_RTCORBA_ThreadpoolPolicy_nil (
++    void
++  )
++{
++  return RTCORBA::ThreadpoolPolicy::_nil ();
++}
++
++ACE_INLINE RTCORBA::ThreadpoolPolicy_ptr
++tao_RTCORBA_ThreadpoolPolicy_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::ThreadpoolPolicy::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_ThreadpoolPolicy_upcast (
++    void *src
++  )
++{
++  RTCORBA::ThreadpoolPolicy **tmp =
++    ACE_static_cast (RTCORBA::ThreadpoolPolicy **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -588,6 +674,49 @@
+ #if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_)
+ #define _RTCORBA_PROTOCOLPROPERTIES___CI_
+ 
++ACE_INLINE RTCORBA::ProtocolProperties_ptr
++tao_RTCORBA_ProtocolProperties_duplicate (
++    RTCORBA::ProtocolProperties_ptr p
++  )
++{
++  return RTCORBA::ProtocolProperties::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_ProtocolProperties_release (
++    RTCORBA::ProtocolProperties_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::ProtocolProperties_ptr
++tao_RTCORBA_ProtocolProperties_nil (
++    void
++  )
++{
++  return RTCORBA::ProtocolProperties::_nil ();
++}
++
++ACE_INLINE RTCORBA::ProtocolProperties_ptr
++tao_RTCORBA_ProtocolProperties_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::ProtocolProperties::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_ProtocolProperties_upcast (
++    void *src
++  )
++{
++  RTCORBA::ProtocolProperties **tmp =
++    ACE_static_cast (RTCORBA::ProtocolProperties **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1182,6 +1311,49 @@
+ #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_)
+ #define _RTCORBA_SERVERPROTOCOLPOLICY___CI_
+ 
++ACE_INLINE RTCORBA::ServerProtocolPolicy_ptr
++tao_RTCORBA_ServerProtocolPolicy_duplicate (
++    RTCORBA::ServerProtocolPolicy_ptr p
++  )
++{
++  return RTCORBA::ServerProtocolPolicy::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_ServerProtocolPolicy_release (
++    RTCORBA::ServerProtocolPolicy_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::ServerProtocolPolicy_ptr
++tao_RTCORBA_ServerProtocolPolicy_nil (
++    void
++  )
++{
++  return RTCORBA::ServerProtocolPolicy::_nil ();
++}
++
++ACE_INLINE RTCORBA::ServerProtocolPolicy_ptr
++tao_RTCORBA_ServerProtocolPolicy_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::ServerProtocolPolicy::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_ServerProtocolPolicy_upcast (
++    void *src
++  )
++{
++  RTCORBA::ServerProtocolPolicy **tmp =
++    ACE_static_cast (RTCORBA::ServerProtocolPolicy **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1189,6 +1361,49 @@
+ #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_)
+ #define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_
+ 
++ACE_INLINE RTCORBA::ClientProtocolPolicy_ptr
++tao_RTCORBA_ClientProtocolPolicy_duplicate (
++    RTCORBA::ClientProtocolPolicy_ptr p
++  )
++{
++  return RTCORBA::ClientProtocolPolicy::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_ClientProtocolPolicy_release (
++    RTCORBA::ClientProtocolPolicy_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::ClientProtocolPolicy_ptr
++tao_RTCORBA_ClientProtocolPolicy_nil (
++    void
++  )
++{
++  return RTCORBA::ClientProtocolPolicy::_nil ();
++}
++
++ACE_INLINE RTCORBA::ClientProtocolPolicy_ptr
++tao_RTCORBA_ClientProtocolPolicy_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::ClientProtocolPolicy::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_ClientProtocolPolicy_upcast (
++    void *src
++  )
++{
++  RTCORBA::ClientProtocolPolicy **tmp =
++    ACE_static_cast (RTCORBA::ClientProtocolPolicy **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1196,6 +1411,49 @@
+ #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_)
+ #define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_
+ 
++ACE_INLINE RTCORBA::PrivateConnectionPolicy_ptr
++tao_RTCORBA_PrivateConnectionPolicy_duplicate (
++    RTCORBA::PrivateConnectionPolicy_ptr p
++  )
++{
++  return RTCORBA::PrivateConnectionPolicy::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_PrivateConnectionPolicy_release (
++    RTCORBA::PrivateConnectionPolicy_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::PrivateConnectionPolicy_ptr
++tao_RTCORBA_PrivateConnectionPolicy_nil (
++    void
++  )
++{
++  return RTCORBA::PrivateConnectionPolicy::_nil ();
++}
++
++ACE_INLINE RTCORBA::PrivateConnectionPolicy_ptr
++tao_RTCORBA_PrivateConnectionPolicy_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::PrivateConnectionPolicy::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_PrivateConnectionPolicy_upcast (
++    void *src
++  )
++{
++  RTCORBA::PrivateConnectionPolicy **tmp =
++    ACE_static_cast (RTCORBA::PrivateConnectionPolicy **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1203,6 +1461,49 @@
+ #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_)
+ #define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_
+ 
++ACE_INLINE RTCORBA::TCPProtocolProperties_ptr
++tao_RTCORBA_TCPProtocolProperties_duplicate (
++    RTCORBA::TCPProtocolProperties_ptr p
++  )
++{
++  return RTCORBA::TCPProtocolProperties::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_TCPProtocolProperties_release (
++    RTCORBA::TCPProtocolProperties_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::TCPProtocolProperties_ptr
++tao_RTCORBA_TCPProtocolProperties_nil (
++    void
++  )
++{
++  return RTCORBA::TCPProtocolProperties::_nil ();
++}
++
++ACE_INLINE RTCORBA::TCPProtocolProperties_ptr
++tao_RTCORBA_TCPProtocolProperties_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::TCPProtocolProperties::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_TCPProtocolProperties_upcast (
++    void *src
++  )
++{
++  RTCORBA::TCPProtocolProperties **tmp =
++    ACE_static_cast (RTCORBA::TCPProtocolProperties **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1210,6 +1511,49 @@
+ #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_)
+ #define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_
+ 
++ACE_INLINE RTCORBA::GIOPProtocolProperties_ptr
++tao_RTCORBA_GIOPProtocolProperties_duplicate (
++    RTCORBA::GIOPProtocolProperties_ptr p
++  )
++{
++  return RTCORBA::GIOPProtocolProperties::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_GIOPProtocolProperties_release (
++    RTCORBA::GIOPProtocolProperties_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::GIOPProtocolProperties_ptr
++tao_RTCORBA_GIOPProtocolProperties_nil (
++    void
++  )
++{
++  return RTCORBA::GIOPProtocolProperties::_nil ();
++}
++
++ACE_INLINE RTCORBA::GIOPProtocolProperties_ptr
++tao_RTCORBA_GIOPProtocolProperties_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::GIOPProtocolProperties::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_GIOPProtocolProperties_upcast (
++    void *src
++  )
++{
++  RTCORBA::GIOPProtocolProperties **tmp =
++    ACE_static_cast (RTCORBA::GIOPProtocolProperties **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1217,6 +1561,49 @@
+ #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_)
+ #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_
+ 
++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_ptr
++tao_RTCORBA_UnixDomainProtocolProperties_duplicate (
++    RTCORBA::UnixDomainProtocolProperties_ptr p
++  )
++{
++  return RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_UnixDomainProtocolProperties_release (
++    RTCORBA::UnixDomainProtocolProperties_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_ptr
++tao_RTCORBA_UnixDomainProtocolProperties_nil (
++    void
++  )
++{
++  return RTCORBA::UnixDomainProtocolProperties::_nil ();
++}
++
++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_ptr
++tao_RTCORBA_UnixDomainProtocolProperties_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::UnixDomainProtocolProperties::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_UnixDomainProtocolProperties_upcast (
++    void *src
++  )
++{
++  RTCORBA::UnixDomainProtocolProperties **tmp =
++    ACE_static_cast (RTCORBA::UnixDomainProtocolProperties **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1224,6 +1611,49 @@
+ #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_)
+ #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_
+ 
++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_ptr
++tao_RTCORBA_SharedMemoryProtocolProperties_duplicate (
++    RTCORBA::SharedMemoryProtocolProperties_ptr p
++  )
++{
++  return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_SharedMemoryProtocolProperties_release (
++    RTCORBA::SharedMemoryProtocolProperties_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_ptr
++tao_RTCORBA_SharedMemoryProtocolProperties_nil (
++    void
++  )
++{
++  return RTCORBA::SharedMemoryProtocolProperties::_nil ();
++}
++
++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_ptr
++tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_SharedMemoryProtocolProperties_upcast (
++    void *src
++  )
++{
++  RTCORBA::SharedMemoryProtocolProperties **tmp =
++    ACE_static_cast (RTCORBA::SharedMemoryProtocolProperties **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1782,6 +2212,49 @@
+ #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_)
+ #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_
+ 
++ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_ptr
++tao_RTCORBA_PriorityBandedConnectionPolicy_duplicate (
++    RTCORBA::PriorityBandedConnectionPolicy_ptr p
++  )
++{
++  return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_PriorityBandedConnectionPolicy_release (
++    RTCORBA::PriorityBandedConnectionPolicy_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_ptr
++tao_RTCORBA_PriorityBandedConnectionPolicy_nil (
++    void
++  )
++{
++  return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
++}
++
++ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_ptr
++tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_PriorityBandedConnectionPolicy_upcast (
++    void *src
++  )
++{
++  RTCORBA::PriorityBandedConnectionPolicy **tmp =
++    ACE_static_cast (RTCORBA::PriorityBandedConnectionPolicy **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1789,6 +2262,49 @@
+ #if !defined (_RTCORBA_CURRENT___CI_)
+ #define _RTCORBA_CURRENT___CI_
+ 
++ACE_INLINE RTCORBA::Current_ptr
++tao_RTCORBA_Current_duplicate (
++    RTCORBA::Current_ptr p
++  )
++{
++  return RTCORBA::Current::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_Current_release (
++    RTCORBA::Current_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::Current_ptr
++tao_RTCORBA_Current_nil (
++    void
++  )
++{
++  return RTCORBA::Current::_nil ();
++}
++
++ACE_INLINE RTCORBA::Current_ptr
++tao_RTCORBA_Current_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::Current::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_Current_upcast (
++    void *src
++  )
++{
++  RTCORBA::Current **tmp =
++    ACE_static_cast (RTCORBA::Current **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1796,6 +2312,49 @@
+ #if !defined (_RTCORBA_MUTEX___CI_)
+ #define _RTCORBA_MUTEX___CI_
+ 
++ACE_INLINE RTCORBA::Mutex_ptr
++tao_RTCORBA_Mutex_duplicate (
++    RTCORBA::Mutex_ptr p
++  )
++{
++  return RTCORBA::Mutex::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_Mutex_release (
++    RTCORBA::Mutex_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::Mutex_ptr
++tao_RTCORBA_Mutex_nil (
++    void
++  )
++{
++  return RTCORBA::Mutex::_nil ();
++}
++
++ACE_INLINE RTCORBA::Mutex_ptr
++tao_RTCORBA_Mutex_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::Mutex::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_Mutex_upcast (
++    void *src
++  )
++{
++  RTCORBA::Mutex **tmp =
++    ACE_static_cast (RTCORBA::Mutex **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1811,6 +2370,49 @@
+ #if !defined (_RTCORBA_RTORB___CI_)
+ #define _RTCORBA_RTORB___CI_
+ 
++ACE_INLINE RTCORBA::RTORB_ptr
++tao_RTCORBA_RTORB_duplicate (
++    RTCORBA::RTORB_ptr p
++  )
++{
++  return RTCORBA::RTORB::_duplicate (p);
++}
++
++ACE_INLINE void
++tao_RTCORBA_RTORB_release (
++    RTCORBA::RTORB_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++ACE_INLINE RTCORBA::RTORB_ptr
++tao_RTCORBA_RTORB_nil (
++    void
++  )
++{
++  return RTCORBA::RTORB::_nil ();
++}
++
++ACE_INLINE RTCORBA::RTORB_ptr
++tao_RTCORBA_RTORB_narrow (
++    CORBA::Object *p,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++{
++  return RTCORBA::RTORB::_narrow (p, ACE_TRY_ENV);
++}
++
++ACE_INLINE CORBA::Object *
++tao_RTCORBA_RTORB_upcast (
++    void *src
++  )
++{
++  RTCORBA::RTORB **tmp =
++    ACE_static_cast (RTCORBA::RTORB **, src);
++  return *tmp;
++}
++
+ 
+ #endif /* end #if !defined */
+ 
+@@ -1912,4 +2514,3 @@
+   );
+ 
+ #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_I_ */
+-