From 26d85ba68c3725a1b19a79e01dc60d4eac70de05 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis <karakasis@cscs.ch> Date: Thu, 22 Sep 2016 17:05:35 +0200 Subject: [PATCH] Fix for warnings with latest intel compiler. Also updates modparser to point to the latest master. --- external/modparser | 2 +- src/util/range.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/modparser b/external/modparser index ad8d926f..a3aa02b2 160000 --- a/external/modparser +++ b/external/modparser @@ -1 +1 @@ -Subproject commit ad8d926fd4a3e92cdcfb7b77c527550f859496d2 +Subproject commit a3aa02b2888a23aa9dbd2244ef3709dd01fc6c31 diff --git a/src/util/range.hpp b/src/util/range.hpp index df5625d0..94053ee4 100644 --- a/src/util/range.hpp +++ b/src/util/range.hpp @@ -140,7 +140,7 @@ struct range { return is_forward_iterator<U>::value && left != right && std::next(left) != right; } - static const bool is_splittable_in_proportion() { + static constexpr bool is_splittable_in_proportion() { return is_forward_iterator<U>::value; } #endif -- GitLab