mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-11-25 00:43:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix pertition_point for gcc5.x

Browse source
This commit is contained in:
bolero-MURAKAMI 2017-08-06 10:09:03 +09:00
parent 74d7368aa5
commit 08f2556030
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.rst
View file

@ -35,8 +35,8 @@ Supported Compilers
Linux: 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 * 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 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 * 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 Author

2
sprout/algorithm/partition_point.hpp
View file

@ -17,7 +17,7 @@
#include <sprout/iterator/operation.hpp> #include <sprout/iterator/operation.hpp>
namespace sprout { 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 { namespace detail {
template<typename ForwardIterator, typename Predicate> template<typename ForwardIterator, typename Predicate>
inline SPROUT_CONSTEXPR ForwardIterator inline SPROUT_CONSTEXPR ForwardIterator

11
tools/testspr/test.sh
View file

@ -48,8 +48,12 @@ get_std_option() {
if [ "${1}" = "gcc" ]; then if [ "${1}" = "gcc" ]; then
if [ "${vn}" -lt "480" ]; then if [ "${vn}" -lt "480" ]; then
echo -n "-std=c++11" echo -n "-std=c++11"
else elif [ "${vn}" -lt "510" ]; then
echo -n "-std=c++1y" echo -n "-std=c++1y"
elif [ "${vn}" -lt "610" ]; then
echo -n "-std=c++14"
else
echo -n "-std=c++1z"
fi fi
elif [ "${1}" = "clang" ]; then elif [ "${1}" = "clang" ]; then
if [ "${vn}" -lt "32" ]; then if [ "${vn}" -lt "32" ]; then
@ -64,8 +68,10 @@ get_std_option() {
if [ "${1}" = "gcc" ]; then if [ "${1}" = "gcc" ]; then
if [ "${vn}" -lt "480" ]; then if [ "${vn}" -lt "480" ]; then
echo -n "-std=c++11" echo -n "-std=c++11"
else elif [ "${vn}" -lt "510" ]; then
echo -n "-std=c++1y" echo -n "-std=c++1y"
else
echo -n "-std=c++14"
fi fi
elif [ "${1}" = "clang" ]; then elif [ "${1}" = "clang" ]; then
if [ "${vn}" -lt "32" ]; then if [ "${vn}" -lt "32" ]; then
@ -133,6 +139,7 @@ if [ ${use_help} -ne 0 ]; then
echo " Default; '/usr/local'" echo " Default; '/usr/local'"
echo "" echo ""
echo " --std=<c++XX> Standard C++ version." echo " --std=<c++XX> Standard C++ version."
echo " c++11, c++14, or c++17."
echo " Default; 'c++11'" echo " Default; 'c++11'"
echo "" echo ""
echo " -O, --option=<opt> Add compile option." echo " -O, --option=<opt> Add compile option."