]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix the last remaining constexpr std::max in patterns.h 4677/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Mon, 31 Jul 2017 15:38:08 +0000 (17:38 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Mon, 31 Jul 2017 15:38:54 +0000 (17:38 +0200)
include/deal.II/base/patterns.h

index 69c8441b14a7b13bcf706d5a98c50a10593c3dbb..38a6a25d2ae5f4097748abcafb8151dc8999093b 100644 (file)
@@ -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;
       };
     }
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.