From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Mon, 31 Jul 2017 15:38:08 +0000 (+0200)
Subject: Fix the last remaining constexpr std::max in patterns.h
X-Git-Tag: v9.0.0-rc1~1374^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50a22da191a36b8b4b47fe5c627d22dff531334b;p=dealii.git

Fix the last remaining constexpr std::max in patterns.h
---

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 69c8441b14..38a6a25d2a 100644
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -1303,8 +1303,8 @@ namespace Patterns
       template <class Key, class Value>
       struct RankInfo<std::pair<Key,Value>>
       {
-        static constexpr int list_rank = std::max(RankInfo<Key>::list_rank, RankInfo<Value>::list_rank);
-        static constexpr int map_rank = std::max(RankInfo<Key>::map_rank, RankInfo<Value>::map_rank)+1;
+        static constexpr int list_rank = std_cxx14::max(RankInfo<Key>::list_rank, RankInfo<Value>::list_rank);
+        static constexpr int map_rank = std_cxx14::max(RankInfo<Key>::map_rank, RankInfo<Value>::map_rank)+1;
       };
     }