ChangeLogTag: Fri Apr 8 09:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 47 insertions, 293 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d5339e7a5c0..1dd2e8784ed 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Apr  8 09:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/advanced_resource.cpp:
+          Fixed pharlab issue
+
+        * tao/*.pidl:
+        * tao/*C.{h,cpp,inl}:
+        * tao/*S.{h,cpp,inl}:
+          Use the new -Sci and -Ssi option to suppress generating the
+          C.inl/S.inl file and removed them from the repo by regenerating
+          all files.
+
 Fri Apr  8 09:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 8f33d43c0a7..872b702aa31 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -658,7 +658,7 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
       break;
 
     case TAO_REACTOR_MSGWFMO:
-#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
       ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0);
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
       break;
diff --git a/TAO/tao/Strategies/sciop_endpoints.pidl b/TAO/tao/Strategies/sciop_endpoints.pidl
index 0831dc7bb50..42050da0264 100644
--- a/TAO/tao/Strategies/sciop_endpoints.pidl
+++ b/TAO/tao/Strategies/sciop_endpoints.pidl
@@ -23,7 +23,7 @@
 //   is:
 //
 //     tao_idl
-//         -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3
+//         -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci
 //          -Wb,export_macro=TAO_Strategies_Export \
 //          -Wb,export_include="strategies_export.h" \
 //          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp
index 27c101a6b8d..4ac004e0bfe 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.cpp
+++ b/TAO/tao/Strategies/sciop_endpointsC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "sciop_endpointsC.h"
@@ -42,12 +42,8 @@
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
-#if !defined (__ACE_INLINE__)
-#include "sciop_endpointsC.inl"
-#endif /* !defined INLINE */
-
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -56,7 +52,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:70
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_SCIOP_Endpoint_Info[] =
   {
@@ -81,12 +77,12 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_TAO_SCIOP_Endpoint_Info;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:68
+// be\be_visitor_structure/structure_cs.cpp:66
 
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_SCIOPENDPOINTSEQUENCE_CS_)
 #define _TAO_SCIOPENDPOINTSEQUENCE_CS_
@@ -130,18 +126,21 @@ TAO_SCIOPEndpointSequence::~TAO_SCIOPEndpointSequence (void)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:914
+// be\be_visitor_typecode/typecode_defn.cpp:925
+
 
+#ifndef _TAO_TYPECODE_TAO_SCIOPEndpointSequence_GUARD
+#define _TAO_TYPECODE_TAO_SCIOPEndpointSequence_GUARD
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+    TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
       TAO_SCIOPEndpointSequence_0 (
         CORBA::tk_sequence,
@@ -154,6 +153,8 @@ namespace TAO
   }
 }
 
+
+#endif /* _TAO_TYPECODE_TAO_SCIOPEndpointSequence_GUARD */
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             CORBA::tk_alias,
@@ -167,7 +168,7 @@ static TAO::TypeCode::Alias<char const *,
   &_tao_tc_TAO_SCIOPEndpointSequence;
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -192,7 +193,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_
 #define _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_
@@ -262,102 +263,3 @@ CORBA::Boolean operator>> (
 }
 
 #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1528
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO_Var_Var_T<
-        TAO_SCIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Var_Base_T<
-        TAO_SCIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Out_T<
-        TAO_SCIOP_Endpoint_Info,
-        TAO_SCIOP_Endpoint_Info_var
-      >;
-
-  template class
-    TAO_VarSeq_Var_T<
-        TAO_SCIOPEndpointSequence,
-        TAO_SCIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Seq_Var_Base_T<
-        TAO_SCIOPEndpointSequence,
-        TAO_SCIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Seq_Out_T<
-        TAO_SCIOPEndpointSequence,
-        TAO_SCIOPEndpointSequence_var,
-        TAO_SCIOP_Endpoint_Info
-      >;
-
-#if !defined (_TAO_SCIOP_ENDPOINT_INFO__EXPLICIT_CS_)
-#define _TAO_SCIOP_ENDPOINT_INFO__EXPLICIT_CS_
-
-  template class
-    TAO_Unbounded_Sequence<
-        TAO_SCIOP_Endpoint_Info
-      >;
-
-#endif /* end #if !defined */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO_Var_Var_T< \
-        TAO_SCIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Var_Base_T< \
-        TAO_SCIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Out_T< \
-        TAO_SCIOP_Endpoint_Info, \
-        TAO_SCIOP_Endpoint_Info_var \
-      >
-
-# pragma instantiate \
-    TAO_VarSeq_Var_T< \
-        TAO_SCIOPEndpointSequence, \
-        TAO_SCIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Seq_Var_Base_T< \
-        TAO_SCIOPEndpointSequence, \
-        TAO_SCIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Seq_Out_T< \
-        TAO_SCIOPEndpointSequence, \
-        TAO_SCIOPEndpointSequence_var, \
-        TAO_SCIOP_Endpoint_Info \
-      >
-
-#if !defined (_TAO_SCIOP_ENDPOINT_INFO__EXPLICIT_CS_)
-#define _TAO_SCIOP_ENDPOINT_INFO__EXPLICIT_CS_
-
-# pragma instantiate \
-    TAO_Unbounded_Sequence< \
-        TAO_SCIOP_Endpoint_Info \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h
index 8a7fbfd2420..4e89a5b4e47 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.h
+++ b/TAO/tao/Strategies/sciop_endpointsC.h
@@ -181,11 +181,7 @@ TAO_Strategies_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:958
-
-#if defined (__ACE_INLINE__)
-#include "sciop_endpointsC.inl"
-#endif /* defined INLINE */
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/Strategies/sciop_endpointsC.inl b/TAO/tao/Strategies/sciop_endpointsC.inl
deleted file mode 100644
index c944d806c1f..00000000000
--- a/TAO/tao/Strategies/sciop_endpointsC.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- 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
-
diff --git a/TAO/tao/Strategies/uiop_endpoints.pidl b/TAO/tao/Strategies/uiop_endpoints.pidl
index 64cda7fa838..47856ae4ea4 100644
--- a/TAO/tao/Strategies/uiop_endpoints.pidl
+++ b/TAO/tao/Strategies/uiop_endpoints.pidl
@@ -21,7 +21,7 @@
 //   is:
 //
 //     tao_idl
-//         -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3
+//         -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci
 //          -Wb,export_macro=TAO_Strategies_Export \
 //          -Wb,export_include="strategies_export.h" \
 //          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp
index 2de0c28d2fa..4bb53206057 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.cpp
+++ b/TAO/tao/Strategies/uiop_endpointsC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "uiop_endpointsC.h"
@@ -42,12 +42,8 @@
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
-#if !defined (__ACE_INLINE__)
-#include "uiop_endpointsC.inl"
-#endif /* !defined INLINE */
-
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -56,7 +52,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:70
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_UIOP_Endpoint_Info[] =
   {
@@ -80,12 +76,12 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_TAO_UIOP_Endpoint_Info;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:68
+// be\be_visitor_structure/structure_cs.cpp:66
 
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_UIOPENDPOINTSEQUENCE_CS_)
 #define _TAO_UIOPENDPOINTSEQUENCE_CS_
@@ -129,18 +125,21 @@ TAO_UIOPEndpointSequence::~TAO_UIOPEndpointSequence (void)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:914
+// be\be_visitor_typecode/typecode_defn.cpp:925
+
 
+#ifndef _TAO_TYPECODE_TAO_UIOPEndpointSequence_GUARD
+#define _TAO_TYPECODE_TAO_UIOPEndpointSequence_GUARD
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+    TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
       TAO_UIOPEndpointSequence_0 (
         CORBA::tk_sequence,
@@ -153,6 +152,8 @@ namespace TAO
   }
 }
 
+
+#endif /* _TAO_TYPECODE_TAO_UIOPEndpointSequence_GUARD */
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             CORBA::tk_alias,
@@ -166,7 +167,7 @@ static TAO::TypeCode::Alias<char const *,
   &_tao_tc_TAO_UIOPEndpointSequence;
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -189,7 +190,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_
 #define _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_
@@ -259,102 +260,3 @@ CORBA::Boolean operator>> (
 }
 
 #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1528
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO_Var_Var_T<
-        TAO_UIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Var_Base_T<
-        TAO_UIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Out_T<
-        TAO_UIOP_Endpoint_Info,
-        TAO_UIOP_Endpoint_Info_var
-      >;
-
-  template class
-    TAO_VarSeq_Var_T<
-        TAO_UIOPEndpointSequence,
-        TAO_UIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Seq_Var_Base_T<
-        TAO_UIOPEndpointSequence,
-        TAO_UIOP_Endpoint_Info
-      >;
-
-  template class
-    TAO_Seq_Out_T<
-        TAO_UIOPEndpointSequence,
-        TAO_UIOPEndpointSequence_var,
-        TAO_UIOP_Endpoint_Info
-      >;
-
-#if !defined (_TAO_UIOP_ENDPOINT_INFO__EXPLICIT_CS_)
-#define _TAO_UIOP_ENDPOINT_INFO__EXPLICIT_CS_
-
-  template class
-    TAO_Unbounded_Sequence<
-        TAO_UIOP_Endpoint_Info
-      >;
-
-#endif /* end #if !defined */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO_Var_Var_T< \
-        TAO_UIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Var_Base_T< \
-        TAO_UIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Out_T< \
-        TAO_UIOP_Endpoint_Info, \
-        TAO_UIOP_Endpoint_Info_var \
-      >
-
-# pragma instantiate \
-    TAO_VarSeq_Var_T< \
-        TAO_UIOPEndpointSequence, \
-        TAO_UIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Seq_Var_Base_T< \
-        TAO_UIOPEndpointSequence, \
-        TAO_UIOP_Endpoint_Info \
-      >
-
-# pragma instantiate \
-    TAO_Seq_Out_T< \
-        TAO_UIOPEndpointSequence, \
-        TAO_UIOPEndpointSequence_var, \
-        TAO_UIOP_Endpoint_Info \
-      >
-
-#if !defined (_TAO_UIOP_ENDPOINT_INFO__EXPLICIT_CS_)
-#define _TAO_UIOP_ENDPOINT_INFO__EXPLICIT_CS_
-
-# pragma instantiate \
-    TAO_Unbounded_Sequence< \
-        TAO_UIOP_Endpoint_Info \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h
index 37ec67a9bc3..f85b1a69906 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.h
+++ b/TAO/tao/Strategies/uiop_endpointsC.h
@@ -180,11 +180,7 @@ TAO_Strategies_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:958
-
-#if defined (__ACE_INLINE__)
-#include "uiop_endpointsC.inl"
-#endif /* defined INLINE */
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/Strategies/uiop_endpointsC.inl b/TAO/tao/Strategies/uiop_endpointsC.inl
deleted file mode 100644
index c944d806c1f..00000000000
--- a/TAO/tao/Strategies/uiop_endpointsC.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- 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
-