Thu Mar 24 17:02:34 Will Otte <wotte@dre.vanderbilt.edu>

13 files changed, 52 insertions, 4 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index db7946f25ed..cc9d6feb6ab 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Mar 24 17:02:34  Will Otte <wotte@dre.vanderbilt.edu>
+
+	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
+	* DAnCE/Config_Handlers/Deployment.hpp
+	* DAnCE/Config_Handlers/ccd.hpp
+	* DAnCE/Config_Handlers/cdd.hpp
+	* DAnCE/Config_Handlers/cdp.hpp
+	* DAnCE/Config_Handlers/cid.hpp
+	* DAnCE/Config_Handlers/cpd.hpp
+	* DAnCE/Config_Handlers/iad.hpp
+	* DAnCE/Config_Handlers/pcd.hpp
+	* DAnCE/Config_Handlers/toplevel.hpp
+	* DAnCE/Config_Handlers/XSCRT/XML.hpp
+
+	Finally beat a big warning problem in VC6.
+
 Thu Mar 24 15:19:21 2005  Will Otte <wotte@dre.vanderbilt.edu>
 
 	* DAnCE/Config_Handlers/XSCRT/Elements.hpp
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
index 76cd1186223..392126456ec 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
@@ -2,6 +2,8 @@
 #ifndef BASIC_DEPLOYMENT_DATA_HPP
 #define BASIC_DEPLOYMENT_DATA_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
index d7261b35cd8..94f21f37439 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
@@ -2,6 +2,8 @@
 #ifndef DEPLOYMENT_HPP
 #define DEPLOYMENT_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp
index d969cc254ea..52cf23fca70 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp
@@ -2,6 +2,7 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
+
 #ifndef XSCRT_XML_HPP
 #define XSCRT_XML_HPP
 
@@ -10,13 +11,10 @@
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLString.hpp>
 
+
 //@@ VC6
 #if defined (_MSC_VER) && (_MSC_VER < 1300)
 
-// This disables a warning thrown in debug  builds saying that
-// long names have been truncated. 
-#pragma warning(disable:4786)
-
 namespace std
 {
   typedef ::size_t size_t;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
index 7393a202184..b69c3c6d416 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
@@ -2,6 +2,8 @@
 #ifndef CCD_HPP
 #define CCD_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
index 1e7cb10fcee..bd5d4bdd6a1 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
@@ -2,6 +2,8 @@
 #ifndef CDD_HPP
 #define CDD_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
index 2800f5009fa..1b3557fa021 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
@@ -2,6 +2,8 @@
 #ifndef CDP_HPP
 #define CDP_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
index cec4bfcfced..60c997a4161 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
@@ -2,6 +2,8 @@
 #ifndef CID_HPP
 #define CID_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
index b2fc917ee19..cba10256836 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
@@ -2,6 +2,8 @@
 #ifndef CPD_HPP
 #define CPD_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
index 72236c41f24..92bf45f1fd2 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
@@ -2,6 +2,8 @@
 #ifndef IAD_HPP
 #define IAD_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
index 7b8116f8ae7..cfc07d252a9 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
@@ -2,6 +2,8 @@
 #ifndef PCD_HPP
 #define PCD_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
index daad8ea0e54..5a76cd98456 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
@@ -2,6 +2,8 @@
 #ifndef TOPLEVEL_HPP
 #define TOPLEVEL_HPP
 
+#include "vc6-4786.h"
+
 // Forward declarations.
 //
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/vc6-4786.h b/TAO/CIAO/DAnCE/Config_Handlers/vc6-4786.h
new file mode 100644
index 00000000000..ab8457de1cd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/vc6-4786.h
@@ -0,0 +1,14 @@
+/**
+ * @file vc6-4786.h
+ * @author Will Otte <wotte@dre.vanderbilt.edu
+ * $Id$
+ * Silences that nefarious 4786 warning in a bit cleaner way
+ * than sprinkling the same preprocessor directives all over the code.
+ */
+
+#ifndef VC6_4786_H_
+# define VC6_4786_H_
+# if defined (_MSC_VER) && (_MSC_VER < 1300)
+#  pragma warning (disable: 4786)
+# endif
+#endif /* VC6_4786_H_ */