From 36729273ab6a5159743f789f1f5f8a9902331d93 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 28 Feb 2013 09:08:05 +0000 Subject: [PATCH] Add Pragmas for MSVC git-svn-id: https://svn.dealii.org/branches/branch_cmake@28641 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/config.h.in | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 1dff744c98..602b1d0fff 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -159,20 +159,20 @@ #cmakedefine DEAL_II_MSVC /* Disable a bunch of warnings for Microsoft Visual C++. */ -//#ifdef DEAL_II_MSVC -//# pragma warning( disable : 4244 ) /* implied downcasting from double to float */ -//# pragma warning( disable : 4267 ) /* implied downcasting from size_t to unsigned int */ -//# pragma warning( disable : 4996 ) /* unsafe functions, such as strcat and sprintf */ -//# pragma warning( disable : 4355 ) /* 'this' : used in base member initializer list */ -//# pragma warning( disable : 4661 ) /* no suitable definition provided for explicit template instantiation request */ -//# pragma warning( disable : 4800 ) /* forcing value to bool 'true' or 'false' (performance warning) */ -//# pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */ -//# pragma warning( disable : 4667 ) /* no function template defined that matches forced instantiation */ -//# pragma warning( disable : 4520 ) /* multiple default constructors specified */ -//# pragma warning( disable : 4700 ) /* uninitialized local variable */ -//# pragma warning( disable : 4789 ) /* destination of memory copy is too small */ -//# pragma warning( disable : 4808 ) /* case 'value' is not a valid value for switch condition of type 'bool */ -//#endif // DEAL_II_MSVC +#ifdef _MSC_VER +# pragma warning( disable : 4244 ) /* implied downcasting from double to float */ +# pragma warning( disable : 4267 ) /* implied downcasting from size_t to unsigned int */ +# pragma warning( disable : 4996 ) /* unsafe functions, such as strcat and sprintf */ +# pragma warning( disable : 4355 ) /* 'this' : used in base member initializer list */ +# pragma warning( disable : 4661 ) /* no suitable definition provided for explicit template instantiation request */ +# pragma warning( disable : 4800 ) /* forcing value to bool 'true' or 'false' (performance warning) */ +# pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */ +# pragma warning( disable : 4667 ) /* no function template defined that matches forced instantiation */ +# pragma warning( disable : 4520 ) /* multiple default constructors specified */ +# pragma warning( disable : 4700 ) /* uninitialized local variable */ +# pragma warning( disable : 4789 ) /* destination of memory copy is too small */ +# pragma warning( disable : 4808 ) /* case 'value' is not a valid value for switch condition of type 'bool */ +#endif /*_MSC_VER*/ /**************************************** -- 2.39.5