ChangeLogTag: Wed Mar 30 07:53:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 613 insertions, 669 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index edd93501dd1..451446c6d78 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Wed Mar 30 08:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Domain/*S*.{h,cpp,inl}:
+          Regenerated
+
+        * tao/RTScheduling/Request_Interceptor.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+        * tests/CDR/tc.cpp:
+        * tests/Portable_Interceptors/Benchmark/interceptors.cpp:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp:
+          Fixed include of Typecode.h to TypeCode.h
+
+        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.{h,cpp}:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.{h,cpp}:
+          Added copy/destroy operations for the Policies
+
+        * examples/RTScheduling/FP_SchedulingC.{h,cpp,i,inl}:
+        * examples/RTScheduling/MIF_SchedulingC.{h,cpp,i,inl}:
+          Regenerated and replace .i with .inl version
+
+        * examples/RTScheduling/FP_Scheduling.pidl:
+        * examples/RTScheduling/MIF_Scheduling.pidl:
+          Updated includes so that regeneration is easier
+
 Wed Mar 30 07:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/TypeCodeFactory_Adapter.h:
diff --git a/TAO/examples/RTScheduling/FP_Scheduling.pidl b/TAO/examples/RTScheduling/FP_Scheduling.pidl
index ae50248097d..b7ec8bb38bc 100644
--- a/TAO/examples/RTScheduling/FP_Scheduling.pidl
+++ b/TAO/examples/RTScheduling/FP_Scheduling.pidl
@@ -1,6 +1,6 @@
 //$Id$
-#include "tao/RTScheduling/RTScheduler.pidl"
-#include "tao/RTCORBA/RTCORBA.pidl"
+#include "tao/RTScheduling/RTScheduler_include.pidl"
+#include "tao/RTCORBA/RTCORBA_include.pidl"
 
 module FP_Scheduling
 {
@@ -9,11 +9,11 @@ module FP_Scheduling
   {
     attribute RTCORBA::Priority value;
   };
-  
+
   local interface FP_Scheduler : RTScheduling::Scheduler
   {
     SegmentSchedulingParameterPolicy
-      create_segment_scheduling_parameter 
+      create_segment_scheduling_parameter
         (in RTCORBA::Priority segment_priority);
   };
 };
diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.cpp b/TAO/examples/RTScheduling/FP_SchedulingC.cpp
index 7b9f98d7a82..4bb65eda544 100644
--- a/TAO/examples/RTScheduling/FP_SchedulingC.cpp
+++ b/TAO/examples/RTScheduling/FP_SchedulingC.cpp
@@ -26,12 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:302
+// be\be_codegen.cpp:302
 
 
 #include "FP_SchedulingC.h"
-#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/Any_Impl_T.h"
+#include "tao/Basic_Arguments.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,24 +45,25 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "FP_SchedulingC.i"
+#include "FP_SchedulingC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for FP_Scheduling::SegmentSchedulingParameterPolicy.
 
 FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
-TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::tao_duplicate (
+TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::duplicate (
     FP_Scheduling::SegmentSchedulingParameterPolicy_ptr p
   )
 {
@@ -64,7 +71,7 @@ TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::tao_duplica
 }
 
 void
-TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::tao_release (
+TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::release (
     FP_Scheduling::SegmentSchedulingParameterPolicy_ptr p
   )
 {
@@ -72,33 +79,27 @@ TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::tao_release
 }
 
 FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
-TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::tao_nil (void)
+TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::nil (void)
 {
   return FP_Scheduling::SegmentSchedulingParameterPolicy::_nil ();
 }
 
 CORBA::Boolean
-TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::tao_marshal (
+TAO::Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>::marshal (
     FP_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*FP_Scheduling__TAO_SegmentSchedulingParameterPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 FP_Scheduling::SegmentSchedulingParameterPolicy::SegmentSchedulingParameterPolicy (void)
 {}
 
 FP_Scheduling::SegmentSchedulingParameterPolicy::~SegmentSchedulingParameterPolicy (void)
 {}
 
-void
+void 
 FP_Scheduling::SegmentSchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SegmentSchedulingParameterPolicy *_tao_tmp_pointer =
@@ -116,10 +117,27 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::_narrow (
     {
       return SegmentSchedulingParameterPolicy::_nil ();
     }
-
+  
   SegmentSchedulingParameterPolicy_ptr proxy =
     dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref);
+  
+  return SegmentSchedulingParameterPolicy::_duplicate (proxy);
+}
 
+FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
+FP_Scheduling::SegmentSchedulingParameterPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return SegmentSchedulingParameterPolicy::_nil ();
+    }
+  
+  SegmentSchedulingParameterPolicy_ptr proxy =
+    dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref);
+  
   return SegmentSchedulingParameterPolicy::_duplicate (proxy);
 }
 
@@ -130,10 +148,16 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::_duplicate (SegmentSchedulingPa
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
+void
+FP_Scheduling::SegmentSchedulingParameterPolicy::_tao_release (SegmentSchedulingParameterPolicy_ptr obj)
+{
+  CORBA::release (obj);
+}
+
 CORBA::Boolean
 FP_Scheduling::SegmentSchedulingParameterPolicy::_is_a (
     const char *value
@@ -142,28 +166,28 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:FP_Scheduling/SegmentSchedulingParameterPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
-      return 1; // success using local knowledge
+      return true; // success using local knowledge
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -175,63 +199,34 @@ const char* FP_Scheduling::SegmentSchedulingParameterPolicy::_interface_reposito
 CORBA::Boolean
 FP_Scheduling::SegmentSchedulingParameterPolicy::marshal (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_FP_Scheduling_SegmentSchedulingParameterPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x46505f53),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c696e),
-  ACE_NTOHL (0x672f5365),
-  ACE_NTOHL (0x676d656e),
-  ACE_NTOHL (0x74536368),
-  ACE_NTOHL (0x6564756c),
-  ACE_NTOHL (0x696e6750),
-  ACE_NTOHL (0x6172616d),
-  ACE_NTOHL (0x65746572),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63793a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:FP_Scheduling/SegmentSchedulingParameterPolicy:1.0
-    33,
-  ACE_NTOHL (0x5365676d), 
-  ACE_NTOHL (0x656e7453), 
-  ACE_NTOHL (0x63686564), 
-  ACE_NTOHL (0x756c696e), 
-  ACE_NTOHL (0x67506172), 
-  ACE_NTOHL (0x616d6574), 
-  ACE_NTOHL (0x6572506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = SegmentSchedulingParameterPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_FP_Scheduling_SegmentSchedulingParameterPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_FP_Scheduling_SegmentSchedulingParameterPolicy),
-    (char *) &_oc_FP_Scheduling_SegmentSchedulingParameterPolicy,
-    0,
-    sizeof (FP_Scheduling::SegmentSchedulingParameterPolicy)
-  );
-
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_FP_Scheduling_SegmentSchedulingParameterPolicy (
+    "IDL:FP_Scheduling/SegmentSchedulingParameterPolicy:1.0",
+    "SegmentSchedulingParameterPolicy");
+  
 namespace FP_Scheduling
 {
-  ::CORBA::TypeCode_ptr _tc_SegmentSchedulingParameterPolicy =
-    &_tc_TAO_tc_FP_Scheduling_SegmentSchedulingParameterPolicy;
+  ::CORBA::TypeCode_ptr const _tc_SegmentSchedulingParameterPolicy =
+    &_tao_tc_FP_Scheduling_SegmentSchedulingParameterPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for FP_Scheduling::FP_Scheduler.
 
 FP_Scheduling::FP_Scheduler_ptr
-TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::tao_duplicate (
+TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::duplicate (
     FP_Scheduling::FP_Scheduler_ptr p
   )
 {
@@ -239,7 +234,7 @@ TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::tao_duplicate (
 }
 
 void
-TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::tao_release (
+TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::release (
     FP_Scheduling::FP_Scheduler_ptr p
   )
 {
@@ -247,26 +242,20 @@ TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::tao_release (
 }
 
 FP_Scheduling::FP_Scheduler_ptr
-TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::tao_nil (void)
+TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::nil (void)
 {
   return FP_Scheduling::FP_Scheduler::_nil ();
 }
 
 CORBA::Boolean
-TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::tao_marshal (
+TAO::Objref_Traits<FP_Scheduling::FP_Scheduler>::marshal (
     FP_Scheduling::FP_Scheduler_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*FP_Scheduling__TAO_FP_Scheduler_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 FP_Scheduling::FP_Scheduler::FP_Scheduler (void)
 {}
 
@@ -299,6 +288,23 @@ FP_Scheduling::FP_Scheduler::_narrow (
 }
 
 FP_Scheduling::FP_Scheduler_ptr
+FP_Scheduling::FP_Scheduler::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return FP_Scheduler::_nil ();
+    }
+  
+  FP_Scheduler_ptr proxy =
+    dynamic_cast<FP_Scheduler_ptr> (_tao_objref);
+  
+  return FP_Scheduler::_duplicate (proxy);
+}
+
+FP_Scheduling::FP_Scheduler_ptr
 FP_Scheduling::FP_Scheduler::_duplicate (FP_Scheduler_ptr obj)
 {
   if (! CORBA::is_nil (obj))
@@ -309,6 +315,12 @@ FP_Scheduling::FP_Scheduler::_duplicate (FP_Scheduler_ptr obj)
   return obj;
 }
 
+void
+FP_Scheduling::FP_Scheduler::_tao_release (FP_Scheduler_ptr obj)
+{
+  CORBA::release (obj);
+}
+
 CORBA::Boolean
 FP_Scheduling::FP_Scheduler::_is_a (
     const char *value
@@ -317,28 +329,28 @@ FP_Scheduling::FP_Scheduler::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/Scheduler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:FP_Scheduling/FP_Scheduler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
-      return 1; // success using local knowledge
+      return true; // success using local knowledge
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -350,50 +362,31 @@ const char* FP_Scheduling::FP_Scheduler::_interface_repository_id (void) const
 CORBA::Boolean
 FP_Scheduling::FP_Scheduler::marshal (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_FP_Scheduling_FP_Scheduler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x46505f53), 
-  ACE_NTOHL (0x63686564), 
-  ACE_NTOHL (0x756c696e), 
-  ACE_NTOHL (0x672f4650), 
-  ACE_NTOHL (0x5f536368), 
-  ACE_NTOHL (0x6564756c), 
-  ACE_NTOHL (0x65723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:FP_Scheduling/FP_Scheduler:1.0
-    13,
-  ACE_NTOHL (0x46505f53), 
-  ACE_NTOHL (0x63686564), 
-  ACE_NTOHL (0x756c6572), 
-  ACE_NTOHL (0x0),  // name = FP_Scheduler
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_FP_Scheduling_FP_Scheduler (
-    CORBA::tk_objref,
-    sizeof (_oc_FP_Scheduling_FP_Scheduler),
-    (char *) &_oc_FP_Scheduling_FP_Scheduler,
-    0,
-    sizeof (FP_Scheduling::FP_Scheduler)
-  );
-
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_FP_Scheduling_FP_Scheduler (
+    "IDL:FP_Scheduling/FP_Scheduler:1.0",
+    "FP_Scheduler");
+  
 namespace FP_Scheduling
 {
-  ::CORBA::TypeCode_ptr _tc_FP_Scheduler =
-    &_tc_TAO_tc_FP_Scheduling_FP_Scheduler;
+  ::CORBA::TypeCode_ptr const _tc_FP_Scheduler =
+    &_tao_tc_FP_Scheduling_FP_Scheduler;
 }
 
+
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<FP_Scheduling::SegmentSchedulingParameterPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -403,18 +396,18 @@ TAO::Any_Impl_T<FP_Scheduling::SegmentSchedulingParameterPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<FP_Scheduling::SegmentSchedulingParameterPolicy>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<FP_Scheduling::SegmentSchedulingParameterPolicy>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -460,9 +453,9 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<FP_Scheduling::FP_Scheduler>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -472,18 +465,18 @@ TAO::Any_Impl_T<FP_Scheduling::FP_Scheduler>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<FP_Scheduling::FP_Scheduler>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<FP_Scheduling::FP_Scheduler>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -527,93 +520,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1702
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO::Objref_Traits<
-        FP_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        FP_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-  
-  template class
-    TAO_Objref_Out_T<
-        FP_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        FP_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO::Objref_Traits<
-        FP_Scheduling::FP_Scheduler
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        FP_Scheduling::FP_Scheduler
-      >;
-  
-  template class
-    TAO_Objref_Out_T<
-        FP_Scheduling::FP_Scheduler
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        FP_Scheduling::FP_Scheduler
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        FP_Scheduling::SegmentSchedulingParameterPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        FP_Scheduling::SegmentSchedulingParameterPolicy
-      >
-  
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        FP_Scheduling::SegmentSchedulingParameterPolicy
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        FP_Scheduling::SegmentSchedulingParameterPolicy \
-      >
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        FP_Scheduling::FP_Scheduler \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        FP_Scheduling::FP_Scheduler
-      >
-  
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        FP_Scheduling::FP_Scheduler
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        FP_Scheduling::FP_Scheduler \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.h b/TAO/examples/RTScheduling/FP_SchedulingC.h
index 16aa47b1163..c1f94a038aa 100644
--- a/TAO/examples/RTScheduling/FP_SchedulingC.h
+++ b/TAO/examples/RTScheduling/FP_SchedulingC.h
@@ -26,35 +26,37 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:150
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_FP_SCHEDULINGC_H_
 #define _TAO_IDL_FP_SCHEDULINGC_H_
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/CDR.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "tao/RTScheduling/RTScheduler.h"
-#include "tao/RTCORBA/RTCORBA.h"
+#include "tao/RTScheduling/RTScheduler_includeC.h"
+#include "tao/RTCORBA/RTCORBA_includeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO
+#define TAO_EXPORT_MACRO 
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
+#  define TAO_EXPORT_NESTED_MACRO 
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -66,38 +68,38 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be/be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace FP_Scheduling
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be\be_interface.cpp:598
 
 #if !defined (_FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_)
 #define _FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_
-
+  
   class SegmentSchedulingParameterPolicy;
   typedef SegmentSchedulingParameterPolicy *SegmentSchedulingParameterPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         SegmentSchedulingParameterPolicy
       >
     SegmentSchedulingParameterPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         SegmentSchedulingParameterPolicy
@@ -105,102 +107,129 @@ namespace FP_Scheduling
     SegmentSchedulingParameterPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_)
 #define _FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_
-
+  
   class  SegmentSchedulingParameterPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef SegmentSchedulingParameterPolicy_ptr _ptr_type;
     typedef SegmentSchedulingParameterPolicy_var _var_type;
-
+    
     // The static operations.
     static SegmentSchedulingParameterPolicy_ptr _duplicate (SegmentSchedulingParameterPolicy_ptr obj);
-
+    
+    static void _tao_release (SegmentSchedulingParameterPolicy_ptr obj);
+    
     static SegmentSchedulingParameterPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
+    static SegmentSchedulingParameterPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static SegmentSchedulingParameterPolicy_ptr _nil (void)
     {
-      return (SegmentSchedulingParameterPolicy_ptr)0;
+      return static_cast<SegmentSchedulingParameterPolicy_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::Priority value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void value (
-        RTCORBA::Priority value
+        ::RTCORBA::Priority value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     SegmentSchedulingParameterPolicy (void);
-
+    
     virtual ~SegmentSchedulingParameterPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     SegmentSchedulingParameterPolicy (const SegmentSchedulingParameterPolicy &);
-
+    
     void operator= (const SegmentSchedulingParameterPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SegmentSchedulingParameterPolicy;
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SegmentSchedulingParameterPolicy;
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be\be_interface.cpp:598
 
 #if !defined (_FP_SCHEDULING_FP_SCHEDULER__VAR_OUT_CH_)
 #define _FP_SCHEDULING_FP_SCHEDULER__VAR_OUT_CH_
-
+  
   class FP_Scheduler;
   typedef FP_Scheduler *FP_Scheduler_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         FP_Scheduler
       >
     FP_Scheduler_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         FP_Scheduler
@@ -208,84 +237,91 @@ namespace FP_Scheduling
     FP_Scheduler_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_FP_SCHEDULING_FP_SCHEDULER_CH_)
 #define _FP_SCHEDULING_FP_SCHEDULER_CH_
-
+  
   class  FP_Scheduler
-    : public virtual RTScheduling::Scheduler
+    : public virtual ::RTScheduling::Scheduler
   {
   public:
     typedef FP_Scheduler_ptr _ptr_type;
     typedef FP_Scheduler_var _var_type;
-
+    
     // The static operations.
     static FP_Scheduler_ptr _duplicate (FP_Scheduler_ptr obj);
-
+    
+    static void _tao_release (FP_Scheduler_ptr obj);
+    
     static FP_Scheduler_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
+    static FP_Scheduler_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static FP_Scheduler_ptr _nil (void)
     {
-      return (FP_Scheduler_ptr)0;
+      return static_cast<FP_Scheduler_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter (
-        RTCORBA::Priority segment_priority
+        ::RTCORBA::Priority segment_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
-
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     FP_Scheduler (void);
-
+    
     virtual ~FP_Scheduler (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     FP_Scheduler (const FP_Scheduler &);
-
+    
     void operator= (const FP_Scheduler &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FP_Scheduler;
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_FP_Scheduler;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module FP_Scheduling
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:48
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -293,19 +329,19 @@ namespace TAO
 
 #if !defined (_FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_)
 #define _FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct  Objref_Traits<FP_Scheduling::SegmentSchedulingParameterPolicy>
+  
+  template<>
+  struct  Objref_Traits< ::FP_Scheduling::SegmentSchedulingParameterPolicy>
   {
-    static FP_Scheduling::SegmentSchedulingParameterPolicy_ptr tao_duplicate (
-        FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
+    static ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr duplicate (
+        ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
       );
-    static void tao_release (
-        FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
+    static void release (
+        ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
       );
-    static FP_Scheduling::SegmentSchedulingParameterPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        FP_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
+    static ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -314,19 +350,19 @@ namespace TAO
 
 #if !defined (_FP_SCHEDULING_FP_SCHEDULER__TRAITS_CH_)
 #define _FP_SCHEDULING_FP_SCHEDULER__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct  Objref_Traits<FP_Scheduling::FP_Scheduler>
+  
+  template<>
+  struct  Objref_Traits< ::FP_Scheduling::FP_Scheduler>
   {
-    static FP_Scheduling::FP_Scheduler_ptr tao_duplicate (
-        FP_Scheduling::FP_Scheduler_ptr
+    static ::FP_Scheduling::FP_Scheduler_ptr duplicate (
+        ::FP_Scheduling::FP_Scheduler_ptr
       );
-    static void tao_release (
-        FP_Scheduling::FP_Scheduler_ptr
+    static void release (
+        ::FP_Scheduling::FP_Scheduler_ptr
       );
-    static FP_Scheduling::FP_Scheduler_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        FP_Scheduling::FP_Scheduler_ptr p,
+    static ::FP_Scheduling::FP_Scheduler_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::FP_Scheduling::FP_Scheduler_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -335,34 +371,24 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
  void operator<<= (CORBA::Any &, FP_Scheduling::SegmentSchedulingParameterPolicy_ptr); // copying
  void operator<<= (CORBA::Any &, FP_Scheduling::SegmentSchedulingParameterPolicy_ptr *); // non-copying
  CORBA::Boolean operator>>= (const CORBA::Any &, FP_Scheduling::SegmentSchedulingParameterPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
  void operator<<= (CORBA::Any &, FP_Scheduling::FP_Scheduler_ptr); // copying
  void operator<<= (CORBA::Any &, FP_Scheduling::FP_Scheduler_ptr *); // non-copying
  CORBA::Boolean operator>>= (const CORBA::Any &, FP_Scheduling::FP_Scheduler_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:911
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
-#include "FP_SchedulingC.i"
+#include "FP_SchedulingC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
@@ -375,3 +401,4 @@ namespace TAO
 
 #endif /* ifndef */
 
+
diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.i b/TAO/examples/RTScheduling/FP_SchedulingC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/examples/RTScheduling/FP_SchedulingC.i
+++ b/TAO/examples/RTScheduling/FP_SchedulingC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index e8e339faa13..4aa5eb0180d 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -22,6 +22,28 @@ Segment_Sched_Param_Policy::value (RTCORBA::Priority value
   this->value_ = value;
 }
 
+CORBA::Policy_ptr
+Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  Segment_Sched_Param_Policy *copy = 0;
+  ACE_NEW_THROW_EX (copy,
+                    Segment_Sched_Param_Policy,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  copy->value (this->value_ ACE_ENV_ARG_PARAMETER)
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  return copy;
+}
+
+void
+Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+}
+
 Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb)
 {
   ACE_TRY_NEW_ENV
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index bf2f107a710..3c689613388 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -18,6 +18,13 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
   virtual void value (RTCORBA::Priority value
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
  private:
   RTCORBA::Priority value_;
 };
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index 8c3dabfc011..dd80febcece 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -45,6 +45,28 @@ Segment_Sched_Param_Policy::importance (CORBA::Short importance
   this->importance_ = importance;
 }
 
+CORBA::Policy_ptr
+Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  Segment_Sched_Param_Policy *copy = 0;
+  ACE_NEW_THROW_EX (copy,
+                    Segment_Sched_Param_Policy,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  copy->importance (this->importance_ ACE_ENV_ARG_PARAMETER)
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  return copy;
+}
+
+void
+Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+}
+
 MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
   : wait_cond_ (lock_),
     wait_ (0)
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index 64a9322654a..6453b197ce6 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -39,6 +39,12 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy,
                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
  private:
   CORBA::Short importance_;
 };
diff --git a/TAO/examples/RTScheduling/MIF_Scheduling.pidl b/TAO/examples/RTScheduling/MIF_Scheduling.pidl
index 79e4a7a7054..884e71432b4 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduling.pidl
+++ b/TAO/examples/RTScheduling/MIF_Scheduling.pidl
@@ -1,6 +1,6 @@
 //$Id$
-#include "tao/RTScheduling/RTScheduler.pidl"
-#include "tao/RTCORBA/RTCORBA.pidl"
+#include "tao/RTScheduling/RTScheduler_include.pidl"
+#include "tao/RTCORBA/RTCORBA_include.pidl"
 
 module MIF_Scheduling
 {
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
index cd7973138fe..0729a167920 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
@@ -26,12 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:302
+// be\be_codegen.cpp:302
 
 
 #include "MIF_SchedulingC.h"
-#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/String_TypeCode.h"
 #include "tao/Any_Impl_T.h"
+#include "tao/Basic_Arguments.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,19 +45,20 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "MIF_SchedulingC.i"
+#include "MIF_SchedulingC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for MIF_Scheduling::SegmentSchedulingParameterPolicy.
 
@@ -83,22 +90,16 @@ TAO::Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*MIF_Scheduling__TAO_SegmentSchedulingParameterPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 MIF_Scheduling::SegmentSchedulingParameterPolicy::SegmentSchedulingParameterPolicy (void)
 {}
 
 MIF_Scheduling::SegmentSchedulingParameterPolicy::~SegmentSchedulingParameterPolicy (void)
 {}
 
-void
+void 
 MIF_Scheduling::SegmentSchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SegmentSchedulingParameterPolicy *_tao_tmp_pointer =
@@ -116,10 +117,27 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (
     {
       return SegmentSchedulingParameterPolicy::_nil ();
     }
-
+  
   SegmentSchedulingParameterPolicy_ptr proxy =
     dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref);
+  
+  return SegmentSchedulingParameterPolicy::_duplicate (proxy);
+}
 
+MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
+MIF_Scheduling::SegmentSchedulingParameterPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return SegmentSchedulingParameterPolicy::_nil ();
+    }
+  
+  SegmentSchedulingParameterPolicy_ptr proxy =
+    dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref);
+  
   return SegmentSchedulingParameterPolicy::_duplicate (proxy);
 }
 
@@ -130,10 +148,16 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::_duplicate (SegmentSchedulingP
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
+void
+MIF_Scheduling::SegmentSchedulingParameterPolicy::_tao_release (SegmentSchedulingParameterPolicy_ptr obj)
+{
+  CORBA::release (obj);
+}
+
 CORBA::Boolean
 MIF_Scheduling::SegmentSchedulingParameterPolicy::_is_a (
     const char *value
@@ -142,28 +166,28 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:MIF_Scheduling/SegmentSchedulingParameterPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
-      return 1; // success using local knowledge
+      return true; // success using local knowledge
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -175,58 +199,29 @@ const char* MIF_Scheduling::SegmentSchedulingParameterPolicy::_interface_reposit
 CORBA::Boolean
 MIF_Scheduling::SegmentSchedulingParameterPolicy::marshal (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_MIF_Scheduling_SegmentSchedulingParameterPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  56,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x4d49465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e672f53),
-  ACE_NTOHL (0x65676d65),
-  ACE_NTOHL (0x6e745363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x72506f6c),
-  ACE_NTOHL (0x6963793a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:MIF_Scheduling/SegmentSchedulingParameterPolicy:1.0
-    33,
-  ACE_NTOHL (0x5365676d),
-  ACE_NTOHL (0x656e7453),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c696e),
-  ACE_NTOHL (0x67506172),
-  ACE_NTOHL (0x616d6574),
-  ACE_NTOHL (0x6572506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x0),  // name = SegmentSchedulingParameterPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_MIF_Scheduling_SegmentSchedulingParameterPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_MIF_Scheduling_SegmentSchedulingParameterPolicy),
-    (char *) &_oc_MIF_Scheduling_SegmentSchedulingParameterPolicy,
-    0,
-    sizeof (MIF_Scheduling::SegmentSchedulingParameterPolicy)
-  );
-
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_MIF_Scheduling_SegmentSchedulingParameterPolicy (
+    "IDL:MIF_Scheduling/SegmentSchedulingParameterPolicy:1.0",
+    "SegmentSchedulingParameterPolicy");
+  
 namespace MIF_Scheduling
 {
-  ::CORBA::TypeCode_ptr _tc_SegmentSchedulingParameterPolicy =
-    &_tc_TAO_tc_MIF_Scheduling_SegmentSchedulingParameterPolicy;
+  ::CORBA::TypeCode_ptr const _tc_SegmentSchedulingParameterPolicy =
+    &_tao_tc_MIF_Scheduling_SegmentSchedulingParameterPolicy;
 }
 
+
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for MIF_Scheduling::MIF_Scheduler.
 
@@ -258,22 +253,16 @@ TAO::Objref_Traits<MIF_Scheduling::MIF_Scheduler>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*MIF_Scheduling__TAO_MIF_Scheduler_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 MIF_Scheduling::MIF_Scheduler::MIF_Scheduler (void)
 {}
 
 MIF_Scheduling::MIF_Scheduler::~MIF_Scheduler (void)
 {}
 
-void
+void 
 MIF_Scheduling::MIF_Scheduler::_tao_any_destructor (void *_tao_void_pointer)
 {
   MIF_Scheduler *_tao_tmp_pointer =
@@ -291,10 +280,27 @@ MIF_Scheduling::MIF_Scheduler::_narrow (
     {
       return MIF_Scheduler::_nil ();
     }
-
+  
   MIF_Scheduler_ptr proxy =
     dynamic_cast<MIF_Scheduler_ptr> (_tao_objref);
+  
+  return MIF_Scheduler::_duplicate (proxy);
+}
 
+MIF_Scheduling::MIF_Scheduler_ptr
+MIF_Scheduling::MIF_Scheduler::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return MIF_Scheduler::_nil ();
+    }
+  
+  MIF_Scheduler_ptr proxy =
+    dynamic_cast<MIF_Scheduler_ptr> (_tao_objref);
+  
   return MIF_Scheduler::_duplicate (proxy);
 }
 
@@ -305,10 +311,16 @@ MIF_Scheduling::MIF_Scheduler::_duplicate (MIF_Scheduler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
+void
+MIF_Scheduling::MIF_Scheduler::_tao_release (MIF_Scheduler_ptr obj)
+{
+  CORBA::release (obj);
+}
+
 CORBA::Boolean
 MIF_Scheduling::MIF_Scheduler::_is_a (
     const char *value
@@ -317,28 +329,28 @@ MIF_Scheduling::MIF_Scheduler::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/Scheduler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:MIF_Scheduling/MIF_Scheduler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
-      return 1; // success using local knowledge
+      return true; // success using local knowledge
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -350,51 +362,31 @@ const char* MIF_Scheduling::MIF_Scheduler::_interface_repository_id (void) const
 CORBA::Boolean
 MIF_Scheduling::MIF_Scheduler::marshal (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_MIF_Scheduling_MIF_Scheduler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x4d49465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e672f4d),
-  ACE_NTOHL (0x49465f53),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c6572),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:MIF_Scheduling/MIF_Scheduler:1.0
-    14,
-  ACE_NTOHL (0x4d49465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x72000000),  // name = MIF_Scheduler
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_MIF_Scheduling_MIF_Scheduler (
-    CORBA::tk_objref,
-    sizeof (_oc_MIF_Scheduling_MIF_Scheduler),
-    (char *) &_oc_MIF_Scheduling_MIF_Scheduler,
-    0,
-    sizeof (MIF_Scheduling::MIF_Scheduler)
-  );
-
+// be\be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_MIF_Scheduling_MIF_Scheduler (
+    "IDL:MIF_Scheduling/MIF_Scheduler:1.0",
+    "MIF_Scheduler");
+  
 namespace MIF_Scheduling
 {
-  ::CORBA::TypeCode_ptr _tc_MIF_Scheduler =
-    &_tc_TAO_tc_MIF_Scheduling_MIF_Scheduler;
+  ::CORBA::TypeCode_ptr const _tc_MIF_Scheduler =
+    &_tao_tc_MIF_Scheduling_MIF_Scheduler;
 }
 
+
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<MIF_Scheduling::SegmentSchedulingParameterPolicy>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -404,18 +396,18 @@ TAO::Any_Impl_T<MIF_Scheduling::SegmentSchedulingParameterPolicy>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<MIF_Scheduling::SegmentSchedulingParameterPolicy>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<MIF_Scheduling::SegmentSchedulingParameterPolicy>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -461,9 +453,9 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<MIF_Scheduling::MIF_Scheduler>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -473,18 +465,18 @@ TAO::Any_Impl_T<MIF_Scheduling::MIF_Scheduler>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<MIF_Scheduling::MIF_Scheduler>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<MIF_Scheduling::MIF_Scheduler>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -528,92 +520,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1702
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO::Objref_Traits<
-        MIF_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        MIF_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        MIF_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        MIF_Scheduling::SegmentSchedulingParameterPolicy
-      >;
-
-  template class
-    TAO::Objref_Traits<
-        MIF_Scheduling::MIF_Scheduler
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        MIF_Scheduling::MIF_Scheduler
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        MIF_Scheduling::MIF_Scheduler
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        MIF_Scheduling::MIF_Scheduler
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        MIF_Scheduling::SegmentSchedulingParameterPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        MIF_Scheduling::SegmentSchedulingParameterPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        MIF_Scheduling::SegmentSchedulingParameterPolicy
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        MIF_Scheduling::SegmentSchedulingParameterPolicy \
-      >
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        MIF_Scheduling::MIF_Scheduler \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        MIF_Scheduling::MIF_Scheduler
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        MIF_Scheduling::MIF_Scheduler
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        MIF_Scheduling::MIF_Scheduler \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.h b/TAO/examples/RTScheduling/MIF_SchedulingC.h
index a18f4271282..fa06a709109 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.h
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.h
@@ -26,35 +26,37 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:150
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_MIF_SCHEDULINGC_H_
 #define _TAO_IDL_MIF_SCHEDULINGC_H_
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/CDR.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "tao/RTScheduling/RTScheduler.h"
-#include "tao/RTCORBA/RTCORBA.h"
+#include "tao/RTScheduling/RTScheduler_includeC.h"
+#include "tao/RTCORBA/RTCORBA_includeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO
+#define TAO_EXPORT_MACRO 
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
+#  define TAO_EXPORT_NESTED_MACRO 
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -66,38 +68,38 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be/be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace MIF_Scheduling
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be\be_interface.cpp:598
 
 #if !defined (_MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_)
 #define _MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_
-
+  
   class SegmentSchedulingParameterPolicy;
   typedef SegmentSchedulingParameterPolicy *SegmentSchedulingParameterPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         SegmentSchedulingParameterPolicy
       >
     SegmentSchedulingParameterPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         SegmentSchedulingParameterPolicy
@@ -105,102 +107,129 @@ namespace MIF_Scheduling
     SegmentSchedulingParameterPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_)
 #define _MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_
-
+  
   class  SegmentSchedulingParameterPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef SegmentSchedulingParameterPolicy_ptr _ptr_type;
     typedef SegmentSchedulingParameterPolicy_var _var_type;
-
+    
     // The static operations.
     static SegmentSchedulingParameterPolicy_ptr _duplicate (SegmentSchedulingParameterPolicy_ptr obj);
-
+    
+    static void _tao_release (SegmentSchedulingParameterPolicy_ptr obj);
+    
     static SegmentSchedulingParameterPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
+    static SegmentSchedulingParameterPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static SegmentSchedulingParameterPolicy_ptr _nil (void)
     {
-      return (SegmentSchedulingParameterPolicy_ptr)0;
+      return static_cast<SegmentSchedulingParameterPolicy_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Short importance (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void importance (
-        CORBA::Short importance
+        ::CORBA::Short importance
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     SegmentSchedulingParameterPolicy (void);
-
+    
     virtual ~SegmentSchedulingParameterPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     SegmentSchedulingParameterPolicy (const SegmentSchedulingParameterPolicy &);
-
+    
     void operator= (const SegmentSchedulingParameterPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SegmentSchedulingParameterPolicy;
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SegmentSchedulingParameterPolicy;
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:610
+  // be\be_interface.cpp:598
 
 #if !defined (_MIF_SCHEDULING_MIF_SCHEDULER__VAR_OUT_CH_)
 #define _MIF_SCHEDULING_MIF_SCHEDULER__VAR_OUT_CH_
-
+  
   class MIF_Scheduler;
   typedef MIF_Scheduler *MIF_Scheduler_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         MIF_Scheduler
       >
     MIF_Scheduler_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         MIF_Scheduler
@@ -208,84 +237,91 @@ namespace MIF_Scheduling
     MIF_Scheduler_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MIF_SCHEDULING_MIF_SCHEDULER_CH_)
 #define _MIF_SCHEDULING_MIF_SCHEDULER_CH_
-
+  
   class  MIF_Scheduler
-    : public virtual RTScheduling::Scheduler
+    : public virtual ::RTScheduling::Scheduler
   {
   public:
     typedef MIF_Scheduler_ptr _ptr_type;
     typedef MIF_Scheduler_var _var_type;
-
+    
     // The static operations.
     static MIF_Scheduler_ptr _duplicate (MIF_Scheduler_ptr obj);
-
+    
+    static void _tao_release (MIF_Scheduler_ptr obj);
+    
     static MIF_Scheduler_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
+    static MIF_Scheduler_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static MIF_Scheduler_ptr _nil (void)
     {
-      return (MIF_Scheduler_ptr)0;
+      return static_cast<MIF_Scheduler_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter (
-        CORBA::Short segment_importance
+        ::CORBA::Short segment_importance
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
-
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     MIF_Scheduler (void);
-
+    
     virtual ~MIF_Scheduler (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     MIF_Scheduler (const MIF_Scheduler &);
-
+    
     void operator= (const MIF_Scheduler &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MIF_Scheduler;
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_MIF_Scheduler;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module MIF_Scheduling
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:48
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -293,19 +329,19 @@ namespace TAO
 
 #if !defined (_MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_)
 #define _MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct  Objref_Traits<MIF_Scheduling::SegmentSchedulingParameterPolicy>
+  
+  template<>
+  struct  Objref_Traits< ::MIF_Scheduling::SegmentSchedulingParameterPolicy>
   {
-    static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr duplicate (
-        MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
+    static ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr duplicate (
+        ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
       );
     static void release (
-        MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
+        ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
       );
-    static MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr nil (void);
+    static ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
+        ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -314,19 +350,19 @@ namespace TAO
 
 #if !defined (_MIF_SCHEDULING_MIF_SCHEDULER__TRAITS_CH_)
 #define _MIF_SCHEDULING_MIF_SCHEDULER__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct  Objref_Traits<MIF_Scheduling::MIF_Scheduler>
+  
+  template<>
+  struct  Objref_Traits< ::MIF_Scheduling::MIF_Scheduler>
   {
-    static MIF_Scheduling::MIF_Scheduler_ptr duplicate (
-        MIF_Scheduling::MIF_Scheduler_ptr
+    static ::MIF_Scheduling::MIF_Scheduler_ptr duplicate (
+        ::MIF_Scheduling::MIF_Scheduler_ptr
       );
     static void release (
-        MIF_Scheduling::MIF_Scheduler_ptr
+        ::MIF_Scheduling::MIF_Scheduler_ptr
       );
-    static MIF_Scheduling::MIF_Scheduler_ptr nil (void);
+    static ::MIF_Scheduling::MIF_Scheduler_ptr nil (void);
     static CORBA::Boolean marshal (
-        MIF_Scheduling::MIF_Scheduler_ptr p,
+        ::MIF_Scheduling::MIF_Scheduler_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -335,34 +371,24 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
  void operator<<= (CORBA::Any &, MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr); // copying
  void operator<<= (CORBA::Any &, MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr *); // non-copying
  CORBA::Boolean operator>>= (const CORBA::Any &, MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
  void operator<<= (CORBA::Any &, MIF_Scheduling::MIF_Scheduler_ptr); // copying
  void operator<<= (CORBA::Any &, MIF_Scheduling::MIF_Scheduler_ptr *); // non-copying
  CORBA::Boolean operator>>= (const CORBA::Any &, MIF_Scheduling::MIF_Scheduler_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:911
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
-#include "MIF_SchedulingC.i"
+#include "MIF_SchedulingC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
@@ -374,3 +400,5 @@ namespace TAO
 #endif /* __BORLANDC__ */
 
 #endif /* ifndef */
+
+
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.i b/TAO/examples/RTScheduling/MIF_SchedulingC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.i
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 7272ca201d3..185901e966f 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#include "tao/Typecode.h"
+#include "tao/TypeCode.h"
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index c13ec151450..4edc3c1e76c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -3,7 +3,7 @@
 #include "interceptors.h"
 
 #include "tao/DynamicC.h"
-#include "tao/Typecode.h"
+#include "tao/TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (Benchmark,
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 3962aac535e..7d6333c7dff 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -4,7 +4,7 @@
 #include "testC.h"
 
 #include "tao/DynamicC.h"
-#include "tao/Typecode.h"
+#include "tao/TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (Request_Interceptor_Flow,
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index b8607c19501..a69f1e25dd9 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Request_Interceptor_Flow,
 #include "testC.h"
 
 #include "tao/DynamicC.h"
-#include "tao/Typecode.h"
+#include "tao/TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 Server_Request_Interceptor::Server_Request_Interceptor (const char *name)