ChangeLogTag: Wed Dec 8 15:39:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

21 files changed, 223 insertions, 237 deletions

diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 769a1324415..ac5499a6b2c 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -831,9 +831,9 @@ nobase_include_HEADERS += \
   Tagged_Components.i \
   Tagged_Profile.i \
   Thread_Lane_Resources_Manager.i \
-  TimeBaseC.i \
-  TimeBaseS.i \
-  TimeBaseS_T.i \
+  TimeBaseC.inl \
+  TimeBaseS.inl \
+  TimeBaseS_T.inl \
   Transport.inl \
   Transport_Acceptor.inl \
   Transport_Cache_Manager.inl \
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
index afa20b97b1a..e9ab1f5d6c9 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/tao/TimeBase.pidl
@@ -18,13 +18,7 @@
  *        -Wb,post_include="ace/post.h"
  *        TimeBase.pidl
  *
- * after the file is generated a patch must be applied.  The patch
- * eliminates cycles in the include dependencies.  The changes are
- * required because the generated code is part of the TAO library, it
- * hardly makes any sense to change the IDL compiler to support
- * changes that are very occasional.
- *
- *
+ * After that the files are ready for use
  */
 //=============================================================================
 
@@ -49,7 +43,7 @@ module TimeBase
   /**
    * In other words each TimeT is 10^-7 seconds.
    * When used for absolute time 0 is to October 15, 1582. Please read
-   * the spec for further details. 
+   * the spec for further details.
    */
   typedef unsigned long long TimeT;
 
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
index 54a9df5c9a3..7e37b1933ae 100644
--- a/TAO/tao/TimeBaseA.cpp
+++ b/TAO/tao/TimeBaseA.cpp
@@ -27,25 +27,27 @@
 
 #include "TimeBaseC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_TimeT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f54696d),
-  ACE_NTOHL (0x65543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f54696d), 
+  ACE_NTOHL (0x65543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
@@ -56,7 +58,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
     sizeof (_oc_TimeBase_TimeT),
     (char *) &_oc_TimeBase_TimeT,
     0,
-    sizeof (TimeBase::TimeT)
+    0
   );
 
 namespace TimeBase
@@ -66,40 +68,40 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e61),
-  ACE_NTOHL (0x63637572),
-  ACE_NTOHL (0x61637954),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e61), 
+  ACE_NTOHL (0x63637572), 
+  ACE_NTOHL (0x61637954), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
     12,
-  ACE_NTOHL (0x496e6163),
-  ACE_NTOHL (0x63757261),
+  ACE_NTOHL (0x496e6163), 
+  ACE_NTOHL (0x63757261), 
   ACE_NTOHL (0x63795400),  // name = InaccuracyT
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
@@ -111,7 +113,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
     sizeof (_oc_TimeBase_InaccuracyT),
     (char *) &_oc_TimeBase_InaccuracyT,
     0,
-    sizeof (TimeBase::InaccuracyT)
+    0
   );
 
 namespace TimeBase
@@ -121,22 +123,22 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_TdfT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f546466),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f546466), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
     5,
-  ACE_NTOHL (0x54646654),
+  ACE_NTOHL (0x54646654), 
   ACE_NTOHL (0x0),  // name = TdfT
     CORBA::tk_short,
 
@@ -147,7 +149,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
     sizeof (_oc_TimeBase_TdfT),
     (char *) &_oc_TimeBase_TdfT,
     0,
-    sizeof (TimeBase::TdfT)
+    0
   );
 
 namespace TimeBase
@@ -157,52 +159,52 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_UtcT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f557463),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f557463), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
     5,
-  ACE_NTOHL (0x55746354),
+  ACE_NTOHL (0x55746354), 
   ACE_NTOHL (0x0),  // name = UtcT
   4, // member count
     5,
-  ACE_NTOHL (0x74696d65),
+  ACE_NTOHL (0x74696d65), 
   ACE_NTOHL (0x0),  // name = time
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x636c6f00),  // name = inacclo
     CORBA::tk_ulong,
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x63686900),  // name = inacchi
     CORBA::tk_ushort,
 
@@ -212,16 +214,16 @@ static const CORBA::Long _oc_TimeBase_UtcT[] =
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f546466),
-    ACE_NTOHL (0x543a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f546466), 
+    ACE_NTOHL (0x543a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
         5,
-    ACE_NTOHL (0x54646654),
+    ACE_NTOHL (0x54646654), 
     ACE_NTOHL (0x0),  // name = TdfT
         CORBA::tk_short,
 
@@ -233,7 +235,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
     sizeof (_oc_TimeBase_UtcT),
     (char *) &_oc_TimeBase_UtcT,
     0,
-    sizeof (TimeBase::UtcT)
+    0
   );
 
 namespace TimeBase
@@ -243,66 +245,66 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_IntervalT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e74),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6c543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e74), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6c543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
     10,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x7276616c),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x7276616c), 
   ACE_NTOHL (0x54000000),  // name = IntervalT
   2, // member count
     12,
-  ACE_NTOHL (0x6c6f7765),
-  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x6c6f7765), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = lower_bound
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
 
   12,
-  ACE_NTOHL (0x75707065),
-  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x75707065), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = upper_bound
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
@@ -314,7 +316,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
     sizeof (_oc_TimeBase_IntervalT),
     (char *) &_oc_TimeBase_IntervalT,
     0,
-    sizeof (TimeBase::IntervalT)
+    0
   );
 
 namespace TimeBase
@@ -323,7 +325,7 @@ namespace TimeBase
     &_tc_TAO_tc_TimeBase_IntervalT;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -360,8 +362,8 @@ CORBA::Boolean operator>>= (
     TimeBase::UtcT *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TimeBase::UtcT *&,
+  return _tao_any >>= const_cast<
+      const TimeBase::UtcT *&> (
       _tao_elem
     );
 }
@@ -381,7 +383,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -418,8 +420,8 @@ CORBA::Boolean operator>>= (
     TimeBase::IntervalT *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TimeBase::IntervalT *&,
+  return _tao_any >>= const_cast<
+      const TimeBase::IntervalT *&> (
       _tao_elem
     );
 }
@@ -439,8 +441,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -465,5 +465,4 @@ CORBA::Boolean operator>>= (
         TimeBase::IntervalT \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 683a23dffad..848c25e0e5c 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "TimeBaseC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
+#include "TimeBaseC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -50,28 +49,29 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TimeBase::UtcT::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   UtcT *_tao_tmp_pointer =
-    ACE_static_cast (UtcT *, _tao_void_pointer);
+    static_cast<UtcT *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TimeBase::IntervalT::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
-  IntervalT *_tao_tmp_pointer = static_cast<IntervalT *> (_tao_void_pointer);
+  IntervalT *_tao_tmp_pointer =
+    static_cast<IntervalT *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -126,7 +126,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -172,4 +172,4 @@ CORBA::Boolean operator>> (
         TimeBase::IntervalT \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index d7baa55ef8c..67c69d339af 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_TIMEBASEC_H_
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
 
 #include /**/ "ace/pre.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/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/VarOut_T.h"
 
@@ -56,9 +58,7 @@
 #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 */
 
@@ -213,13 +213,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
+#include "TimeBaseC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -231,3 +231,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/TimeBaseS.i b/TAO/tao/TimeBaseC.inl
index 1d2df31bd57..c944d806c1f 100644
--- a/TAO/tao/TimeBaseS.i
+++ b/TAO/tao/TimeBaseC.inl
@@ -24,3 +24,4 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/TimeBaseS.cpp b/TAO/tao/TimeBaseS.cpp
index 884b09e27c5..3690b09801c 100644
--- a/TAO/tao/TimeBaseS.cpp
+++ b/TAO/tao/TimeBaseS.cpp
@@ -15,18 +15,51 @@
 //       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 
+// be\be_codegen.cpp:610
+
 #ifndef _TAO_IDL_ORIG_TIMEBASES_CPP_
 #define _TAO_IDL_ORIG_TIMEBASES_CPP_
 
+
 #include "TimeBaseS.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
+#include "TimeBaseS.inl"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:65
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1683
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseS.h b/TAO/tao/TimeBaseS.h
index 24e75cb8ef9..caf15293c6d 100644
--- a/TAO/tao/TimeBaseS.h
+++ b/TAO/tao/TimeBaseS.h
@@ -15,25 +15,69 @@
 //       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
+// be\be_codegen.cpp:390
+
 #ifndef _TAO_IDL_ORIG_TIMEBASES_H_
 #define _TAO_IDL_ORIG_TIMEBASES_H_
 
 #include /**/ "ace/pre.h"
+
 #include "TimeBaseC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#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
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_TimeBase
+{
+  
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module TimeBase
+
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:999
+
 #include "TimeBaseS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
+#include "TimeBaseS.inl"
 #endif /* defined INLINE */
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseS_T.i b/TAO/tao/TimeBaseS.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/TimeBaseS_T.i
+++ b/TAO/tao/TimeBaseS.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/TimeBaseS_T.cpp b/TAO/tao/TimeBaseS_T.cpp
index 5597b10a284..47c28318e44 100644
--- a/TAO/tao/TimeBaseS_T.cpp
+++ b/TAO/tao/TimeBaseS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:705
+// be\be_codegen.cpp:684
 
 #ifndef _TAO_IDL_ORIG_TIMEBASES_T_CPP_
 #define _TAO_IDL_ORIG_TIMEBASES_T_CPP_
@@ -34,7 +34,7 @@
 #include "TimeBaseS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
+#include "TimeBaseS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h
index 25e0aacd8b6..8f0db8e8344 100644
--- a/TAO/tao/TimeBaseS_T.h
+++ b/TAO/tao/TimeBaseS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:547
 
 #ifndef _TAO_IDL_ORIG_TIMEBASES_T_H_
 #define _TAO_IDL_ORIG_TIMEBASES_T_H_
@@ -34,9 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -44,17 +42,15 @@
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_TimeBase
 {
 } // module TimeBase
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1111
+// be\be_codegen.cpp:1096
 
 #if defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
+#include "TimeBaseS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -65,9 +61,10 @@ namespace POA_TimeBase
 #pragma implementation ("TimeBaseS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseS_T.inl
index 38aa32569ba..38aa32569ba 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseS_T.inl
diff --git a/TAO/tao/diffs/TimeBaseC.cpp.diff b/TAO/tao/diffs/TimeBaseC.cpp.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseC.cpp.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseC.h.diff b/TAO/tao/diffs/TimeBaseC.h.diff
deleted file mode 100644
index cad81366a02..00000000000
--- a/TAO/tao/diffs/TimeBaseC.h.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- orig/TimeBaseC.h	Mon Apr  2 10:04:55 2001
-+++ TimeBaseC.h	Mon Apr  2 10:10:14 2001
-@@ -23,7 +23,9 @@
- #define _TAO_IDL_ORIG_TIMEBASEC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+#include "tao/CDR.h"
-+#include "tao/Any.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
diff --git a/TAO/tao/diffs/TimeBaseC.i.diff b/TAO/tao/diffs/TimeBaseC.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseC.i.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS.cpp.diff b/TAO/tao/diffs/TimeBaseS.cpp.diff
deleted file mode 100644
index 4195ebb2ae6..00000000000
--- a/TAO/tao/diffs/TimeBaseS.cpp.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- orig/TimeBaseS.cpp	Mon Apr  2 10:04:55 2001
-+++ TimeBaseS.cpp	Mon Apr  2 10:07:40 2001
-@@ -23,21 +23,6 @@
- #define _TAO_IDL_ORIG_TIMEBASES_CPP_
- 
- #include "TimeBaseS.h"
--#include "tao/PortableServer/Object_Adapter.h"
--#include "tao/PortableServer/Operation_Table.h"
--#include "tao/TAO_Server_Request.h"
--#include "tao/ORB_Core.h"
--#include "tao/Stub.h"
--#include "tao/IFR_Client_Adapter.h"
--#include "ace/Dynamic_Service.h"
--
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
--#if defined (__BORLANDC__)
--#pragma option -w-rvl -w-rch -w-ccc -w-aus
--#endif /* __BORLANDC__ */
- 
- #if !defined (__ACE_INLINE__)
- #include "TimeBaseS.i"
diff --git a/TAO/tao/diffs/TimeBaseS.h.diff b/TAO/tao/diffs/TimeBaseS.h.diff
deleted file mode 100644
index 9afae67fa71..00000000000
--- a/TAO/tao/diffs/TimeBaseS.h.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- orig/TimeBaseS.h	Mon Apr  2 10:04:55 2001
-+++ TimeBaseS.h	Mon Apr  2 18:53:35 2001
-@@ -30,42 +30,11 @@
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/PortableServer/PortableServer.h"
--#include "tao/PortableServer/Servant_Base.h"
--#include "tao/PortableServer/Collocated_Object.h"
--#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
--#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
--#include "tao/PortableServer/ServerRequestInfo.h"
--
--#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_NAMESPACE  POA_TimeBase
--{
--}
--TAO_NAMESPACE_CLOSE
--
- #include "TimeBaseS_T.h"
- 
- #if defined (__ACE_INLINE__)
- #include "TimeBaseS.i"
- #endif /* defined INLINE */
--
--#if defined(_MSC_VER) && (_MSC_VER >= 1200)
--#pragma warning(pop)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option pop
--#endif /* __BORLANDC__ */
- 
- #include "ace/post.h"
- #endif /* ifndef */
diff --git a/TAO/tao/diffs/TimeBaseS.i.diff b/TAO/tao/diffs/TimeBaseS.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS.i.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS_T.cpp.diff b/TAO/tao/diffs/TimeBaseS_T.cpp.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS_T.cpp.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS_T.h.diff b/TAO/tao/diffs/TimeBaseS_T.h.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS_T.h.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS_T.i.diff b/TAO/tao/diffs/TimeBaseS_T.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS_T.i.diff
+++ /dev/null