ChangeLogTag Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 143 insertions, 46 deletions

diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 139f52609f6..d8074e83f99 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -251,7 +251,7 @@ TAO_RTScheduler_Current_i*
 TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_RTScheduler_Current_i *old =
     static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
@@ -264,7 +264,7 @@ TAO_RTScheduler_Current_i*
 TAO_RTScheduler_Current::implementation (void)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_RTScheduler_Current_i* impl =
     static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
@@ -407,9 +407,9 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       ACE_CHECK;
 
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
-      TAO_RTScheduler_Current_i* new_current;
+      TAO_RTScheduler_Current_i* new_current = 0;
         ACE_NEW_THROW_EX (new_current,
                           TAO_RTScheduler_Current_i (this->orb_,
                                                      this->dt_hash_,
@@ -640,7 +640,7 @@ DTTask::svc (void)
     {
 
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
       tss->rtscheduler_current_impl_ = this->current_;
 
@@ -765,7 +765,7 @@ void
 TAO_RTScheduler_Current_i::cleanup_current (void)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_current_impl_ = this->previous_current_;
 
@@ -786,7 +786,7 @@ TAO_RTScheduler_Current_i::delete_all_currents (void)
     }
 
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_current_impl_ = tss->rtscheduler_previous_current_impl_;
 }
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
index 0f18cf7b3b9..a3cfd02e3c4 100644
--- a/TAO/tao/RTScheduling/RTSchedulerA.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTScheduler.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/ThreadAction:1.0",
     "ThreadAction");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadAction =
@@ -61,7 +61,7 @@ static char const * const _tao_enumerators_RTScheduling_DistributableThread_DT_S
   {
     "ACTIVE",
     "CANCELLED"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -72,7 +72,7 @@ static TAO::TypeCode::Enum<char const *,
     "DT_State",
     _tao_enumerators_RTScheduling_DistributableThread_DT_State,
     2);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::DistributableThread::_tc_DT_State =
   &_tao_tc_RTScheduling_DistributableThread_DT_State;
 
@@ -85,7 +85,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/DistributableThread:1.0",
     "DistributableThread");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_DistributableThread =
@@ -108,7 +108,7 @@ static TAO::TypeCode::Struct<char const *,
     "UNSUPPORTED_SCHEDULING_DISCIPLINE",
     _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
   &_tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 
@@ -133,10 +133,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_octet,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_IdType_0 =
       &RTScheduling_Current_IdType_0;
-    
+
   }
 }
 
@@ -151,7 +151,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:RTScheduling/Current/IdType:1.0",
     "IdType",
     &TAO::TypeCode::tc_RTScheduling_Current_IdType_0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_IdType =
   &_tao_tc_RTScheduling_Current_IdType;
 
@@ -176,10 +176,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_string,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_NameList_0 =
       &RTScheduling_Current_NameList_0;
-    
+
   }
 }
 
@@ -194,7 +194,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:RTScheduling/Current/NameList:1.0",
     "NameList",
     &TAO::TypeCode::tc_RTScheduling_Current_NameList_0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_NameList =
   &_tao_tc_RTScheduling_Current_NameList;
 
@@ -207,7 +207,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/Current:1.0",
     "Current");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -225,7 +225,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/ResourceManager:1.0",
     "ResourceManager");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ResourceManager =
@@ -248,7 +248,7 @@ static TAO::TypeCode::Struct<char const *,
     "INCOMPATIBLE_SCHEDULING_DISCIPLINES",
     _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
   &_tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 
@@ -261,7 +261,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/Scheduler:1.0",
     "Scheduler");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Scheduler =
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index e21d1a8c523..464069748a1 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -45,20 +45,21 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:539
 
 #if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
 #define _CORBA_POLICYLIST__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<CORBA::PolicyList>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::PolicyList,
             CORBA::PolicyList_var,
-            CORBA::PolicyList_out
+            CORBA::PolicyList_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::PolicyList>
           >
   {
   };
@@ -138,7 +139,7 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h
new file mode 100644
index 00000000000..d5d3403e8ef
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h
@@ -0,0 +1,96 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:186
+
+#ifndef _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
+#define _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
+
+#include "tao/ORB.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CDR.h"
+#include "tao/Environment.h"
+
+#include "../RTScheduling/RTScheduler.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#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
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index fcff3bf6ec9..2b5358489a6 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -5,8 +5,8 @@
 #include "Distributable_Thread.h"
 #include "tao/TSS_Resources.h"
 #include "tao/debug.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
@@ -36,7 +36,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   TAO_RTScheduler_Current_i *new_current = 0;
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
@@ -129,7 +129,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
     TAO_RTScheduler_Current_i *current = 0;
 
-    TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
     current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
     if (current != 0)
@@ -148,7 +148,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -168,7 +168,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
@@ -232,7 +232,7 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -376,7 +376,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   // Install new current in the ORB and store the previous current
   // implementation
   // current->implementation (new_current)
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_previous_current_impl_ = this->current_->implementation (new_current);
 }
@@ -393,7 +393,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   TAO_RTScheduler_Current_i *current = 0;
   TAO_RTScheduler_Current_i *prev_current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -444,7 +444,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -469,7 +469,7 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)