ChangeLogTag:Mon Dec 29 11:35:08 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

8 files changed, 261 insertions, 239 deletions

diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile
index f751a9c0423..e4f88fa7996 100644
--- a/TAO/tao/RTPortableServer/Makefile
+++ b/TAO/tao/RTPortableServer/Makefile
@@ -26,6 +26,7 @@ ifeq ($(corba_messaging),1)
 CPP_SRCS += \
   RTPortableServer \
   RTPortableServerC \
+  RTPortableServerA \
   RT_Acceptor_Filters \
   RT_Collocation_Resolver \
   RT_Object_Adapter_Factory \
diff --git a/TAO/tao/RTPortableServer/Makefile.bor b/TAO/tao/RTPortableServer/Makefile.bor
index 36874dd84a3..a1718e4838f 100644
--- a/TAO/tao/RTPortableServer/Makefile.bor
+++ b/TAO/tao/RTPortableServer/Makefile.bor
@@ -12,6 +12,7 @@ NAME = TAO_RTPortableServer
 OBJFILES = \
 	$(OBJDIR)\RTPortableServer.obj \
 	$(OBJDIR)\RTPortableServerC.obj \
+	$(OBJDIR)\RTPortableServerA.obj \
 	$(OBJDIR)\RT_Acceptor_Filters.obj \
 	$(OBJDIR)\RT_Collocation_Resolver.obj \
 	$(OBJDIR)\RT_Object_Adapter_Factory.obj \
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index a86cacfbb04..9f40c2719f2 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -18,7 +18,7 @@
 //   this is:
 //
 //     tao_idl
-//          -o orig -Ge 1 -GT
+//          -o orig -Ge 1 -GT -GA
 //          -Wb,export_macro=TAO_RTPortableServer_Export
 //          -Wb,export_include="rtportableserver_export.h"
 //          -Wb,pre_include="ace/pre.h"
@@ -26,22 +26,8 @@
 //          RTPortableServer.pidl
 //
 //   2. Then apply the patches in tao/RTPortableServer/diffs to the
-//   generated code.  The patch fixes include file dependencies and makes
-//   the inheritance of RTPortableServer::POA from PortableServer::POA
-//   non-virtual.  This was to make sure that classes casting from
-//   PortableServer::POA to TAO_POA can still do so.
+//   generated code.
 //
-//   Apply patches using the following commands:
-//
-//   patch < diffs/RTPortableServerC.h.diff
-//   patch < diffs/RTPortableServerC.i.diff
-//   patch < diffs/RTPortableServerC.cpp.diff
-//
-//   Note: The diffs were generated with these commands:
-//
-//   diff -wBbu orig/RTPortableServerC.h RTPortableServerC.h > diffs/RTPortableServerC.h.diff
-//   diff -wBbu orig/RTPortableServerC.i RTPortableServerC.i > diffs/RTPortableServerC.i.diff
-//   diff -wBbu orig/RTPortableServerC.cpp RTPortableServerC.cpp > diffs/RTPortableServerC.cpp.diff
 //
 // ================================================================
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index c37634a7460..6a00297fa31 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -26,21 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:301
+// be/be_codegen.cpp:338
 
 
 #include "RTPortableServerC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/Var_Size_Argument_T.h"
 #include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
@@ -53,56 +42,20 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:59
+// be/be_visitor_arg_traits.cpp:62
 
 // Arg traits specializations.
 namespace TAO
 {
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:262
-
-#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
-#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_RTPortableServer_Export Arg_Traits<CORBA::OctetSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::OctetSeq,
-            CORBA::OctetSeq_var,
-            CORBA::OctetSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:262
-
-#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
-#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_RTPortableServer_Export Arg_Traits<PortableServer::ObjectId>
-    : public
-        Var_Size_Arg_Traits_T<
-            PortableServer::ObjectId,
-            PortableServer::ObjectId_var,
-            PortableServer::ObjectId_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTPortableServer::POA.
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTPortableServer::POA_ptr
 TAO::Objref_Traits<RTPortableServer::POA>::tao_duplicate (
     RTPortableServer::POA_ptr p
@@ -111,6 +64,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::tao_duplicate (
   return RTPortableServer::POA::_duplicate (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
 TAO::Objref_Traits<RTPortableServer::POA>::tao_release (
     RTPortableServer::POA_ptr p
@@ -119,12 +73,14 @@ TAO::Objref_Traits<RTPortableServer::POA>::tao_release (
   CORBA::release (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTPortableServer::POA_ptr
 TAO::Objref_Traits<RTPortableServer::POA>::tao_nil (void)
 {
   return RTPortableServer::POA::_nil ();
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
 TAO::Objref_Traits<RTPortableServer::POA>::tao_marshal (
     RTPortableServer::POA_ptr p,
@@ -160,10 +116,32 @@ RTPortableServer::POA::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return POA::_nil ();
+    }
+
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-  proxy->_add_ref ();
-  return proxy;
+
+  return POA::_duplicate (proxy);
+}
+
+RTPortableServer::POA_ptr
+RTPortableServer::POA::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return POA::_nil ();
+    }
+
+  POA_ptr proxy =
+    dynamic_cast<POA_ptr> (_tao_objref);
+
+  return POA::_duplicate (proxy);
 }
 
 RTPortableServer::POA_ptr
@@ -221,114 +199,9 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_RTPortableServer_POA[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254506f),
-  ACE_NTOHL (0x72746162),
-  ACE_NTOHL (0x6c655365),
-  ACE_NTOHL (0x72766572),
-  ACE_NTOHL (0x2f504f41),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
-    4,
-  ACE_NTOHL (0x504f4100),  // name = POA
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
-    CORBA::tk_objref,
-    sizeof (_oc_RTPortableServer_POA),
-    (char *) &_oc_RTPortableServer_POA,
-    0,
-    sizeof (RTPortableServer::POA)
-  );
-
-namespace RTPortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_POA =
-    &_tc_TAO_tc_RTPortableServer_POA;
-}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTPortableServer::POA>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTPortableServer::POA_ptr _tao_elem
-  )
-{
-  RTPortableServer::POA_ptr _tao_objptr =
-    RTPortableServer::POA::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTPortableServer::POA_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTPortableServer::POA>::insert (
-      _tao_any,
-      RTPortableServer::POA::_tao_any_destructor,
-      RTPortableServer::_tc_POA,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTPortableServer::POA_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTPortableServer::POA>::extract (
-        _tao_any,
-        RTPortableServer::POA::_tao_any_destructor,
-        RTPortableServer::_tc_POA,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1725
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -347,11 +220,6 @@ operator>>= (
         RTPortableServer::POA
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        RTPortableServer::POA
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -369,9 +237,4 @@ operator>>= (
         RTPortableServer::POA
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTPortableServer::POA \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index 97557f90211..3b3f664eb63 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -26,25 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// be/be_codegen.cpp:186
 
 #ifndef _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "rtportableserver_export.h"
+#include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-#include "tao/Sequence_T.h"
+#include "rtportableserver_export.h"
+#include "tao/CDR.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
 
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/RTCORBA/RTCORBA.h"
@@ -78,6 +77,9 @@
 namespace TAO
 {
   class Collocation_Proxy_Broker;
+
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
@@ -87,7 +89,7 @@ namespace RTPortableServer
 {
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be/be_interface.cpp:611
 
 #if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
 #define _RTPORTABLESERVER_POA__VAR_OUT_CH_
@@ -110,7 +112,7 @@ namespace RTPortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:53
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
@@ -130,10 +132,15 @@ namespace RTPortableServer
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
+    static POA_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
     static POA_ptr _nil (void)
-      {
-        return (POA_ptr)0;
-      }
+    {
+      return (POA_ptr)0;
+    }
 
     static void _tao_any_destructor (void *);
 
@@ -195,7 +202,7 @@ namespace RTPortableServer
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:185
+    // be/be_visitor_interface/interface_ch.cpp:196
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -206,28 +213,27 @@ namespace RTPortableServer
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
   protected:
+    // Abstract or local interface only.
     POA (void);
+
     virtual ~POA (void);
 
   private:
+    // Private and unimplemented for concrete interfaces.
     POA (const POA &);
+
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
-
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:66
 
 } // module RTPortableServer
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:48
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -256,13 +262,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr); // copying
-TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr *); // non-copying
-TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
-
-// TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
@@ -273,7 +272,7 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:969
+// be/be_codegen.cpp:1060
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerC.i"
@@ -288,4 +287,5 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 #endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* ifndef */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
index 25826589231..38aa32569ba 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.i
@@ -26,11 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
-
-#if !defined (_RTPORTABLESERVER_POA___CI_)
-#define _RTPORTABLESERVER_POA___CI_
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index 0c54777ff2b..843ac2b347f 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -26,11 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:302
+// be/be_codegen.cpp:338
 
 
 #include "RTScheduler.h"
+#include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
+#include "tao/Var_Size_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -42,18 +44,39 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be/be_visitor_arg_traits.cpp:62
 
 // Arg traits specializations.
 namespace TAO
 {
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_arg_traits.cpp:265
+
+#if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
+#define _CORBA_POLICYLIST__ARG_TRAITS_CS_
+
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_RTScheduler_Export Arg_Traits<CORBA::PolicyList>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::PolicyList,
+            CORBA::PolicyList_var,
+            CORBA::PolicyList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTScheduling::ThreadAction.
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ThreadAction_ptr
 TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate (
     RTScheduling::ThreadAction_ptr p
@@ -62,6 +85,7 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate (
   return RTScheduling::ThreadAction::_duplicate (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
 TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release (
     RTScheduling::ThreadAction_ptr p
@@ -70,12 +94,14 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release (
   CORBA::release (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ThreadAction_ptr
 TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_nil (void)
 {
   return RTScheduling::ThreadAction::_nil ();
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
 TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_marshal (
     RTScheduling::ThreadAction_ptr p,
@@ -115,6 +141,23 @@ RTScheduling::ThreadAction::_narrow (
 }
 
 RTScheduling::ThreadAction_ptr
+RTScheduling::ThreadAction::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ThreadAction::_nil ();
+    }
+
+  ThreadAction_ptr proxy =
+    dynamic_cast<ThreadAction_ptr> (_tao_objref);
+
+  return ThreadAction::_duplicate (proxy);
+}
+
+RTScheduling::ThreadAction_ptr
 RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
 {
   if (! CORBA::is_nil (obj))
@@ -207,6 +250,7 @@ namespace RTScheduling
 
 // Traits specializations for RTScheduling::DistributableThread.
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::DistributableThread_ptr
 TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate (
     RTScheduling::DistributableThread_ptr p
@@ -215,6 +259,7 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate (
   return RTScheduling::DistributableThread::_duplicate (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
 TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release (
     RTScheduling::DistributableThread_ptr p
@@ -223,12 +268,14 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release (
   CORBA::release (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::DistributableThread_ptr
 TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_nil (void)
 {
   return RTScheduling::DistributableThread::_nil ();
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
 TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_marshal (
     RTScheduling::DistributableThread_ptr p,
@@ -313,6 +360,23 @@ RTScheduling::DistributableThread::_narrow (
 }
 
 RTScheduling::DistributableThread_ptr
+RTScheduling::DistributableThread::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return DistributableThread::_nil ();
+    }
+
+  DistributableThread_ptr proxy =
+    dynamic_cast<DistributableThread_ptr> (_tao_objref);
+
+  return DistributableThread::_duplicate (proxy);
+}
+
+RTScheduling::DistributableThread_ptr
 RTScheduling::DistributableThread::_duplicate (DistributableThread_ptr obj)
 {
   if (! CORBA::is_nil (obj))
@@ -408,6 +472,7 @@ namespace RTScheduling
 
 // Traits specializations for RTScheduling::Current.
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Current_ptr
 TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate (
     RTScheduling::Current_ptr p
@@ -416,6 +481,7 @@ TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate (
   return RTScheduling::Current::_duplicate (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
 TAO::Objref_Traits<RTScheduling::Current>::tao_release (
     RTScheduling::Current_ptr p
@@ -424,12 +490,14 @@ TAO::Objref_Traits<RTScheduling::Current>::tao_release (
   CORBA::release (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Current_ptr
 TAO::Objref_Traits<RTScheduling::Current>::tao_nil (void)
 {
   return RTScheduling::Current::_nil ();
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
 TAO::Objref_Traits<RTScheduling::Current>::tao_marshal (
     RTScheduling::Current_ptr p,
@@ -767,6 +835,23 @@ RTScheduling::Current::_narrow (
 }
 
 RTScheduling::Current_ptr
+RTScheduling::Current::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Current::_nil ();
+    }
+
+  Current_ptr proxy =
+    dynamic_cast<Current_ptr> (_tao_objref);
+
+  return Current::_duplicate (proxy);
+}
+
+RTScheduling::Current_ptr
 RTScheduling::Current::_duplicate (Current_ptr obj)
 {
   if (! CORBA::is_nil (obj))
@@ -864,6 +949,7 @@ namespace RTScheduling
 
 // Traits specializations for RTScheduling::ResourceManager.
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ResourceManager_ptr
 TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate (
     RTScheduling::ResourceManager_ptr p
@@ -872,6 +958,7 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate (
   return RTScheduling::ResourceManager::_duplicate (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
 TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release (
     RTScheduling::ResourceManager_ptr p
@@ -880,12 +967,14 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release (
   CORBA::release (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::ResourceManager_ptr
 TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_nil (void)
 {
   return RTScheduling::ResourceManager::_nil ();
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
 TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_marshal (
     RTScheduling::ResourceManager_ptr p,
@@ -925,6 +1014,23 @@ RTScheduling::ResourceManager::_narrow (
 }
 
 RTScheduling::ResourceManager_ptr
+RTScheduling::ResourceManager::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ResourceManager::_nil ();
+    }
+
+  ResourceManager_ptr proxy =
+    dynamic_cast<ResourceManager_ptr> (_tao_objref);
+
+  return ResourceManager::_duplicate (proxy);
+}
+
+RTScheduling::ResourceManager_ptr
 RTScheduling::ResourceManager::_duplicate (ResourceManager_ptr obj)
 {
   if (! CORBA::is_nil (obj))
@@ -1022,6 +1128,7 @@ namespace RTScheduling
 
 // Traits specializations for RTScheduling::Scheduler.
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Scheduler_ptr
 TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate (
     RTScheduling::Scheduler_ptr p
@@ -1030,6 +1137,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate (
   return RTScheduling::Scheduler::_duplicate (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
 TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release (
     RTScheduling::Scheduler_ptr p
@@ -1038,12 +1146,14 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release (
   CORBA::release (p);
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 RTScheduling::Scheduler_ptr
 TAO::Objref_Traits<RTScheduling::Scheduler>::tao_nil (void)
 {
   return RTScheduling::Scheduler::_nil ();
 }
 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
 TAO::Objref_Traits<RTScheduling::Scheduler>::tao_marshal (
     RTScheduling::Scheduler_ptr p,
@@ -1220,6 +1330,23 @@ RTScheduling::Scheduler::_narrow (
 }
 
 RTScheduling::Scheduler_ptr
+RTScheduling::Scheduler::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Scheduler::_nil ();
+    }
+
+  Scheduler_ptr proxy =
+    dynamic_cast<Scheduler_ptr> (_tao_objref);
+
+  return Scheduler::_duplicate (proxy);
+}
+
+RTScheduling::Scheduler_ptr
 RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj)
 {
   if (! CORBA::is_nil (obj))
@@ -1306,10 +1433,24 @@ namespace RTScheduling
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1702
+// be/be_visitor_root/root.cpp:1725
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::PolicyList>;
+
+  template class
+    TAO::Var_Size_Arg_Traits_T<
+        CORBA::PolicyList,
+        CORBA::PolicyList_var,
+        CORBA::PolicyList_out
+      >;
+
+#endif /* end #if !defined */
+
   template class
     TAO::Objref_Traits<
         RTScheduling::ThreadAction
@@ -1425,6 +1566,20 @@ namespace RTScheduling
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::PolicyList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits_T< \
+        CORBA::PolicyList, \
+        CORBA::PolicyList_var, \
+        CORBA::PolicyList_out \
+      >
+
+#endif /* end #if !defined */
+
 # pragma instantiate \
     TAO::Objref_Traits< \
         RTScheduling::ThreadAction \
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index 740eaa554aa..257cda8909e 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:150
+// be/be_codegen.cpp:186
 
 #ifndef _TAO_IDL_ORIG_RTSCHEDULERC_H_
 #define _TAO_IDL_ORIG_RTSCHEDULERC_H_
@@ -86,14 +86,13 @@ namespace TAO
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:48
 
-
-
 namespace CORBA
 {
+
   // TAO_IDL - Generated from
   // be/be_visitor_module/module_ch.cpp:66
-
   typedef void* VoidData;
+
 } // module CORBA
 
 // TAO_IDL - Generated from
@@ -103,7 +102,7 @@ namespace RTScheduling
 {
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be/be_interface.cpp:611
 
 #if !defined (_RTSCHEDULING_THREADACTION__VAR_OUT_CH_)
 #define _RTSCHEDULING_THREADACTION__VAR_OUT_CH_
@@ -146,6 +145,11 @@ namespace RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
+    static ThreadAction_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
     static ThreadAction_ptr _nil (void)
     {
       return (ThreadAction_ptr)0;
@@ -165,7 +169,7 @@ namespace RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
+    // be/be_visitor_interface/interface_ch.cpp:196
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -196,7 +200,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadAction;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be/be_interface.cpp:611
 
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_
@@ -239,6 +243,11 @@ namespace RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
+    static DistributableThread_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
     static DistributableThread_ptr _nil (void)
     {
       return (DistributableThread_ptr)0;
@@ -283,7 +292,7 @@ namespace RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
+    // be/be_visitor_interface/interface_ch.cpp:196
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -314,7 +323,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DistributableThread;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be/be_interface.cpp:611
 
 #if !defined (_RTSCHEDULING_CURRENT__VAR_OUT_CH_)
 #define _RTSCHEDULING_CURRENT__VAR_OUT_CH_
@@ -357,6 +366,11 @@ namespace RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
+    static Current_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
     static Current_ptr _nil (void)
     {
       return (Current_ptr)0;
@@ -626,7 +640,7 @@ namespace RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
+    // be/be_visitor_interface/interface_ch.cpp:196
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -657,7 +671,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be/be_interface.cpp:611
 
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_)
 #define _RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_
@@ -700,6 +714,11 @@ namespace RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
+    static ResourceManager_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
     static ResourceManager_ptr _nil (void)
     {
       return (ResourceManager_ptr)0;
@@ -708,7 +727,7 @@ namespace RTScheduling
 
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
+    // be/be_visitor_interface/interface_ch.cpp:196
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -739,7 +758,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ResourceManager;
 
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be/be_interface.cpp:611
 
 #if !defined (_RTSCHEDULING_SCHEDULER__VAR_OUT_CH_)
 #define _RTSCHEDULING_SCHEDULER__VAR_OUT_CH_
@@ -782,6 +801,11 @@ namespace RTScheduling
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
+    static Scheduler_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
     static Scheduler_ptr _nil (void)
     {
       return (Scheduler_ptr)0;
@@ -1093,7 +1117,7 @@ namespace RTScheduling
       )) = 0;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
+    // be/be_visitor_interface/interface_ch.cpp:196
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1129,7 +1153,7 @@ namespace RTScheduling
 } // module RTScheduling
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:48
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -1252,7 +1276,7 @@ namespace TAO
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:911
+// be/be_codegen.cpp:1060
 
 #if defined (__ACE_INLINE__)
 #include "RTSchedulerC.i"