From 08f255603055e514a1b51f13d94f87d714181c2a Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Sun, 6 Aug 2017 10:09:03 +0900 Subject: [PATCH] fix pertition_point for gcc5.x --- README.rst | 4 ++-- sprout/algorithm/partition_point.hpp | 2 +- tools/testspr/test.sh | 11 +++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 4fc81516..dfff556c 100644 --- a/README.rst +++ b/README.rst @@ -35,8 +35,8 @@ Supported Compilers Linux: -* GCC, C++11/14 mode: 4.7.0~4.7.4, 4.8.0~4.8.5, 4.9.0~4.9.3, 5.1.0, 5.2.0, 5.3.0 -* Clang, C++11/14 mode: 3.2, 3.3, 3.4~3.4.2, 3.5.0~3.5.1, 3.6.0~3.6.2, 3.7.0~3.7.1 +* GCC, C++11/14/17(1z) mode: 4.7.0~4.7.4, 4.8.0~4.8.5, 4.9.0~4.9.4, 5.1.0~5.4.0, 6.1.0~6.4.0, 7.1.0 +* Clang, C++11/14/17(1z) mode: 3.2, 3.3, 3.4~3.4.2, 3.5.0~3.5.1, 3.6.0~3.6.2, 3.7.0~3.7.1, 3.8.0~3.8.1, 3.9.0~3.9.1, 4.0.0~4.0.1 ******************************************************************************* Author diff --git a/sprout/algorithm/partition_point.hpp b/sprout/algorithm/partition_point.hpp index 5bfe94a8..2bce8a89 100644 --- a/sprout/algorithm/partition_point.hpp +++ b/sprout/algorithm/partition_point.hpp @@ -17,7 +17,7 @@ #include namespace sprout { -#if defined(SPROUT_CONFIG_DISABLE_CXX14_CONSTEXPR) || SPROUT_GCC_IN_RANGE((5, 1, 0), (5, 1, 1)) +#if defined(SPROUT_CONFIG_DISABLE_CXX14_CONSTEXPR) || SPROUT_GCC_IN_RANGE((5, 1, 0), (6, 0, 0)) namespace detail { template inline SPROUT_CONSTEXPR ForwardIterator diff --git a/tools/testspr/test.sh b/tools/testspr/test.sh index 64bfc0a2..12625486 100755 --- a/tools/testspr/test.sh +++ b/tools/testspr/test.sh @@ -48,8 +48,12 @@ get_std_option() { if [ "${1}" = "gcc" ]; then if [ "${vn}" -lt "480" ]; then echo -n "-std=c++11" - else + elif [ "${vn}" -lt "510" ]; then echo -n "-std=c++1y" + elif [ "${vn}" -lt "610" ]; then + echo -n "-std=c++14" + else + echo -n "-std=c++1z" fi elif [ "${1}" = "clang" ]; then if [ "${vn}" -lt "32" ]; then @@ -64,8 +68,10 @@ get_std_option() { if [ "${1}" = "gcc" ]; then if [ "${vn}" -lt "480" ]; then echo -n "-std=c++11" - else + elif [ "${vn}" -lt "510" ]; then echo -n "-std=c++1y" + else + echo -n "-std=c++14" fi elif [ "${1}" = "clang" ]; then if [ "${vn}" -lt "32" ]; then @@ -133,6 +139,7 @@ if [ ${use_help} -ne 0 ]; then echo " Default; '/usr/local'" echo "" echo " --std= Standard C++ version." + echo " c++11, c++14, or c++17." echo " Default; 'c++11'" echo "" echo " -O, --option= Add compile option."