From 50a22da191a36b8b4b47fe5c627d22dff531334b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 31 Jul 2017 17:38:08 +0200 Subject: [PATCH] Fix the last remaining constexpr std::max in patterns.h --- include/deal.II/base/patterns.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 struct RankInfo> { - static constexpr int list_rank = std::max(RankInfo::list_rank, RankInfo::list_rank); - static constexpr int map_rank = std::max(RankInfo::map_rank, RankInfo::map_rank)+1; + static constexpr int list_rank = std_cxx14::max(RankInfo::list_rank, RankInfo::list_rank); + static constexpr int map_rank = std_cxx14::max(RankInfo::map_rank, RankInfo::map_rank)+1; }; } -- 2.39.5