From 43470d527c3afc405fa742de1b1788a455e98d07 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 14 Jan 2014 16:29:20 +0000 Subject: [PATCH] Prevent MSVC from #defining min and max as macros. git-svn-id: https://svn.dealii.org/trunk@32205 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/config.h.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index c0a1eda16b..757cf70c39 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2012 - 2013 by the deal.II authors +// Copyright (C) 2012 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -187,6 +187,10 @@ # 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 */ + +/* Also make sure we don't let MS Windows headers define min/max as + macros, see http://support.microsoft.com/kb/143208 */ +# define NOMINMAX #endif /*_MSC_VER*/ -- 2.39.5