From 09084d63551798c5848a4cff033052c265ab86c5 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 27 Apr 2015 13:18:48 -0400 Subject: [PATCH 1/2] Use || operator instead of boost::mpl::or_ for constant boolean value since current Boost compilers all support operator use. --- include/boost/range/detail/common.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/boost/range/detail/common.hpp b/include/boost/range/detail/common.hpp index 00b665b..c50a5d8 100644 --- a/include/boost/range/detail/common.hpp +++ b/include/boost/range/detail/common.hpp @@ -18,10 +18,8 @@ #include #include #include -#include #include #include -#include #include ////////////////////////////////////////////////////////////////////////////// @@ -71,7 +69,7 @@ namespace boost BOOST_STATIC_CONSTANT( bool, is_const_wchar_t_ptr_ = sizeof( boost::range_detail::is_const_wchar_t_ptr_impl( ptr ) ) == sizeof( yes_type ) ); BOOST_STATIC_CONSTANT( bool, is_char_array_ = sizeof( boost::range_detail::is_char_array_impl( ptr ) ) == sizeof( yes_type ) ); BOOST_STATIC_CONSTANT( bool, is_wchar_t_array_ = sizeof( boost::range_detail::is_wchar_t_array_impl( ptr ) ) == sizeof( yes_type ) ); - BOOST_STATIC_CONSTANT( bool, is_string_ = (boost::mpl::or_, boost::mpl::bool_ >::value )); + BOOST_STATIC_CONSTANT( bool, is_string_ = (is_const_char_ptr_ || is_const_wchar_t_ptr_); BOOST_STATIC_CONSTANT( bool, is_array_ = boost::is_array::value ); }; From 0c930a3697e3084fa4ed01a5486be43c85abaeb9 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 27 Apr 2015 14:06:59 -0400 Subject: [PATCH 2/2] Fix syntax error. --- include/boost/range/detail/common.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/range/detail/common.hpp b/include/boost/range/detail/common.hpp index c50a5d8..2cbc554 100644 --- a/include/boost/range/detail/common.hpp +++ b/include/boost/range/detail/common.hpp @@ -69,7 +69,7 @@ namespace boost BOOST_STATIC_CONSTANT( bool, is_const_wchar_t_ptr_ = sizeof( boost::range_detail::is_const_wchar_t_ptr_impl( ptr ) ) == sizeof( yes_type ) ); BOOST_STATIC_CONSTANT( bool, is_char_array_ = sizeof( boost::range_detail::is_char_array_impl( ptr ) ) == sizeof( yes_type ) ); BOOST_STATIC_CONSTANT( bool, is_wchar_t_array_ = sizeof( boost::range_detail::is_wchar_t_array_impl( ptr ) ) == sizeof( yes_type ) ); - BOOST_STATIC_CONSTANT( bool, is_string_ = (is_const_char_ptr_ || is_const_wchar_t_ptr_); + BOOST_STATIC_CONSTANT( bool, is_string_ = (is_const_char_ptr_ || is_const_wchar_t_ptr_)); BOOST_STATIC_CONSTANT( bool, is_array_ = boost::is_array::value ); };