ChangeLogTag: Wed Apr 26 12:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 4 insertions, 130 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 736b25e593b..0953c705cd5 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -1,8 +1,4 @@
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-#pragma warning (disable: 4018)
-#pragma warning (disable: 4284)
-#pragma warning (disable: 4146)
-#endif
+// $Id$
 
 #include "DP_Handler.h"
 #include "ace/UUID.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
index 2cc496de06c..9535d24eef2 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -1,6 +1,6 @@
 //================================================
 /**
- *  @file  STD_CPD_Handler.h
+ *  @file  CPD_Handler.h
  *
  *  $Id$
  *
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index d91c6ae6640..edc5fe7fa6c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -60,5 +60,6 @@ namespace CIAO
   }
 }
 
+#include /**/ "ace/post.h"
 
 #endif /* CIAO_PACKAGING_NIA_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
index 334245559fa..e265295d040 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -1,11 +1,5 @@
 // $Id$
 
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-#pragma warning (disable: 4018)
-#pragma warning (disable: 4284)
-#pragma warning (disable: 4146)
-#endif
-
 #include "STD_PC_Intf.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
index d280fb5c655..c15ae0389b9 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
@@ -1,6 +1,6 @@
 //==============================================================
 /**
- *  @file  STD_PC_Intf.h
+ *  @file  PC_Intf.h
  *
  *  $Id$
  *
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
index 93c2a003606..a23d7f2cdd9 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
@@ -29,19 +29,9 @@ namespace XMLSchema
   typedef XSCRT::FundamentalType<ACE_INT32> int_;
   typedef XSCRT::FundamentalType<ACE_UINT32> unsignedInt;
 
-  //@@ VC6
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-
-  typedef XSCRT::FundamentalType<__int64> long_;
-  typedef XSCRT::FundamentalType<unsigned __int64> unsignedLong;
-
-#else
-
   typedef XSCRT::FundamentalType<ACE_INT64> long_;
   typedef XSCRT::FundamentalType<ACE_UINT64> unsignedLong;
 
-#endif
-
   //@@ It would be nice to use some arbitrary-length integer class.
   //
   typedef long_ decimal;
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index 041b369884a..d7d55058b25 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -1,11 +1,5 @@
 // $Id$
 
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-#pragma warning (disable: 4018)
-#pragma warning (disable: 4284)
-#pragma warning (disable: 4146)
-#endif
-
 #include "XML_File_Intf.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 0d84a6bc28a..26dfbc8e695 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -12,87 +12,6 @@
 
 #include "XSCRT/Parser.hpp"
 
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-
-
-// Stuff for broken VC6. Don't like what you see - use better compiler!
-//
-
-
-inline
-std::wistream&
-operator>> (std::wistream& is, __int64& v)
-{
-  long t;
-  is >> t;
-  v = t;
-  return is;
-}
-
-inline
-std::wistream&
-operator>> (std::wistream& is, unsigned __int64& v)
-{
-  unsigned long t;
-  is >> t;
-  v = t;
-  return is;
-}
-
-inline
-std::wostream&
-operator<< (std::wostream& os, __int64 const& v)
-{
-  os << long (v);
-  return os;
-}
-
-inline
-std::wostream&
-operator<< (std::wostream& os, unsigned __int64 const& v)
-{
-  os << unsigned long (v);
-  return os;
-}
-
-inline
-std::istream&
-operator>> (std::istream& is, __int64& v)
-{
-  long t;
-  is >> t;
-  v = t;
-  return is;
-}
-
-inline
-std::istream&
-operator>> (std::istream& is, unsigned __int64& v)
-{
-  unsigned long t;
-  is >> t;
-  v = t;
-  return is;
-}
-
-inline
-std::ostream&
-operator<< (std::ostream& os, __int64 const& v)
-{
-  os << long (v);
-  return os;
-}
-
-inline
-std::ostream&
-operator<< (std::ostream& os, unsigned __int64 const& v)
-{
-  os << unsigned long (v);
-  return os;
-}
-
-#endif
-
 namespace XSCRT
 {
   struct IdentityProvider
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
index b12fda738d2..1f11533e2bb 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -11,16 +11,6 @@
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLString.hpp>
 
-
-//@@ VC6
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-
-namespace std
-{
-  typedef ::size_t size_t;
-}
-#endif
-
 namespace XSCRT
 {
   namespace XML
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
index 31bad0bc207..6f810782953 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
@@ -21,19 +21,9 @@ namespace XMLSchema
   typedef XSCRT::FundamentalType<int> int_;
   typedef XSCRT::FundamentalType<unsigned int> unsignedInt;
 
-  //@@ VC6
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-
-  typedef XSCRT::FundamentalType<__int64> long_;
-  typedef XSCRT::FundamentalType<unsigned __int64> unsignedLong;
-
-#else
-
   typedef XSCRT::FundamentalType<long long> long_;
   typedef XSCRT::FundamentalType<unsigned long long> unsignedLong;
 
-#endif
-
   //@@ It would be nice to use some arbitrary-length integer class.
   //
   typedef long_ decimal;