ChangeLogTag: Thu Dec 11 17:57:34 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 141 insertions, 11 deletions

diff --git a/TAO/tao/RTScheduling/Makefile.bor b/TAO/tao/RTScheduling/Makefile.bor
index f4feed0e9d7..35ef61c77c1 100644
--- a/TAO/tao/RTScheduling/Makefile.bor
+++ b/TAO/tao/RTScheduling/Makefile.bor
@@ -30,7 +30,7 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTCORBA_CFLAGS) $(TAO_PORTABLESERVER_
 CPPDIR = .
 
 INCDIR_NAME = tao\RTScheduler
-INCLUDES = *.h *.i *.pidl
+INCLUDES = *.h *.i *.pidl *.idl
 
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_RTCORBA_LIB) $(TAO_PORTABLESERVER_LIB)
 
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index f882eb2828a..4387437a822 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -41,20 +41,14 @@
 
 #include "rtscheduler_export.h"
 
-#if 0
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#endif /*if */
-
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/PortableInterceptorC.h"
 
+#ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
+#error "You should not include RTSchedulerC.h directly, use RTScheduler.h"
+#endif /* !TAO_RTSCHEDULER_SAFE_INCLUDE */
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
diff --git a/TAO/tao/RTScheduling/RTScheduler_include.pidl b/TAO/tao/RTScheduling/RTScheduler_include.pidl
new file mode 100644
index 00000000000..c4bd0ba0195
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTScheduler_include.pidl
@@ -0,0 +1,38 @@
+/**
+ * @file RTScheduler_include.pidl
+ *
+ * $Id$
+ *
+ * @brief Include file for use in applications that need RTScheduler.pidl.
+ *
+ * This file just includes RTScheduler.pidl. The *C.h file generated from
+ * this is hand-crafted to itself include RTScheduler.h instead of
+ * RTSchedulerC.h (which will produce a compiler error message if
+ * included directly). The RTScheduler_includeC.h file can then be
+ * included directly and automatically by the IDL compiler when
+ * building the application.
+ *
+ *   1. Run the tao_idl compiler on the pidl file.  The command used for
+ *     this is:
+ *
+ *     tao_idl -o orig -St -Sc -Sp
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          RTScheduler_include.pidl
+ *
+ *   2. Then change this line in RTScheduler_includeC.h:
+ *
+ *          #include "RTSchedulerC.h"
+ *
+ *      to
+ *
+ *          #include "RTScheduler.h"
+ */
+
+#ifndef _RT_SCHEDULER_INCLUDE_IDL_
+#define _RT_SCHEDULER_INCLUDE_IDL_
+
+#include "../RTScheduling/RTScheduler.pidl"
+
+#endif /* _RT_SCHEDULER_INCLUDE_IDL_ */
+
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h
new file mode 100644
index 00000000000..bc2e600f586
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTScheduler_includeC.h
@@ -0,0 +1,98 @@
+// -*- 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_INCLUDEC_H_
+#define _TAO_IDL_RTSCHEDULER_INCLUDEC_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)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#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) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#endif /* ifndef */
+