From 5bf8bbf22c160643089c2ffdeeb66c700011762a Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Thu, 10 Mar 2005 19:54:23 +0000 Subject: Thu Mar 10 13:46:21 2005 Will Otte --- TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp | 5 +++-- TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp | 4 +++- 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 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 { -- cgit v1.2.1