From 5bfc03ed4ac23a8509870decddc67d3ca2bf89c7 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Fri, 9 Feb 2001 15:43:57 +0000 Subject: [PATCH] Cleaned up redundant test is_integral || is_same -> is_integral [SVN r9059] --- include/boost/counting_iterator.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/boost/counting_iterator.hpp b/include/boost/counting_iterator.hpp index 3a8762e..7e67049 100644 --- a/include/boost/counting_iterator.hpp +++ b/include/boost/counting_iterator.hpp @@ -47,6 +47,7 @@ # include # include # include +# include # ifndef BOOST_NO_LIMITS # include # endif @@ -123,11 +124,13 @@ namespace detail { // limitations of the compiler and library. template struct is_numeric { + // For a while, this wasn't true, but we rely on it below. This is a regression assert. + BOOST_STATIC_ASSERT(::boost::is_integral::value); enum { value = #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS std::numeric_limits::is_specialized #elif defined(__BORLANDC__) - ::boost::is_integral::value || ::boost::is_same::value + ::boost::is_integral::value #else boost::is_convertible::value && boost::is_convertible::value #endif