summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2005-03-10 19:54:23 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2005-03-10 19:54:23 +0000
commit5bf8bbf22c160643089c2ffdeeb66c700011762a (patch)
treee233af1b2c5b7b34f0dacb170e8b12f697232a58
parent73ec459d95a08e4dc0956e4892be8e29a2fc754c (diff)
downloadATCD-5bf8bbf22c160643089c2ffdeeb66c700011762a.tar.gz
Thu Mar 10 13:46:21 2005 Will Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp5
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp4
2 files changed, 6 insertions, 3 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp
index e05e1274a0a..197e6441dc8 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp
@@ -14,8 +14,9 @@
* Disabled the warning about using this in the base member initialization section.
* Our use in this file is fine.
*/
-#pragma warning ( disable: 4355 )
-
+#ifdef _MSC_VER
+# pragma warning ( disable: 4355 )
+#endif
namespace XMLSchema
{
typedef XSCRT::FundamentalType<signed char> byte;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
index 0134e8a090e..6745c9ad28c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
@@ -10,7 +10,9 @@
* This causes a warning about converting the return value from
* int to bool.
*/
-#pragma warning( disable: 4800 )
+#ifdef _MSC_VER
+# pragma warning( disable: 4800 )
+#endif
namespace XSCRT
{