diff --git a/include/boost/container_hash/detail/is_range.hpp b/include/boost/container_hash/detail/is_range.hpp index e880869..983d9f1 100644 --- a/include/boost/container_hash/detail/is_range.hpp +++ b/include/boost/container_hash/detail/is_range.hpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -22,9 +21,9 @@ namespace hash_detail #if !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_SFINAE_EXPR) && !BOOST_WORKAROUND(BOOST_GCC, < 40700) -template true_type is_range_check( It first, It last, - typename std::iterator_traits::difference_type* = 0, - typename enable_if_< !is_same::type, typename std::iterator_traits::value_type>::value >::type* = 0 ); +template + integral_constant< bool, !is_same::type, typename std::iterator_traits::value_type>::value > + is_range_check( It first, It last ); template decltype( is_range_check( declval().begin(), declval().end() ) ) is_range_( int ); template false_type is_range_( ... ); diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index e04cf3c..8712560 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -60,7 +60,8 @@ build-project ../examples ; run hash_reference_values.cpp ; run detail_is_range_test.cpp ; -run detail_is_range_test2.cpp ; +run detail_is_range_test2.cpp + : : : gcc:-Wno-variadic-macros ; run detail_is_contiguous_range_test.cpp ; run detail_is_unordered_range_test.cpp ; @@ -72,4 +73,4 @@ run hash_number_test2.cpp ; run hash_integral_test.cpp ; run hash_string_test2.cpp ; -run hash_fs_path_test.cpp /boost//filesystem/off ; +run hash_fs_path_test.cpp /boost//filesystem/off : : : gcc:-Wno-variadic-macros ;