Mostly remove pre-CXX11 workarounds.

CMakeLists.txt

@@ -24,7 +24,6 @@ target_link_libraries(boost_iterator
         Boost::mpl
         Boost::optional
         Boost::smart_ptr
-        Boost::static_assert
         Boost::type_traits
         Boost::utility
 )

example/node_iterator2.hpp

@@ -6,11 +6,7 @@
 
 # include "node.hpp"
 # include <boost/iterator/iterator_facade.hpp>
-
-# ifndef BOOST_NO_SFINAE
-#  include <boost/type_traits/is_convertible.hpp>
-#  include <boost/utility/enable_if.hpp>
-# endif
+# include <type_traits>
 
 template <class Value>
 class node_iter
@@ -33,21 +29,13 @@ class node_iter
     template <class OtherValue>
     node_iter(
         node_iter<OtherValue> const& other
-# ifndef BOOST_NO_SFINAE
-      , typename boost::enable_if<
-            boost::is_convertible<OtherValue*,Value*>
+      , typename std::enable_if<
+            std::is_convertible<OtherValue*,Value*>::value
           , enabler
         >::type = enabler()
-# endif
     )
       : m_node(other.m_node) {}
 
-
-# if !BOOST_WORKAROUND(__GNUC__, == 2)
- private: // GCC2 can't grant friendship to template member functions
-    friend class boost::iterator_core_access;
-# endif
-
     template <class OtherValue>
     bool equal(node_iter<OtherValue> const& other) const
     {

example/node_iterator3.hpp

@@ -6,11 +6,7 @@
 
 # include "node.hpp"
 # include <boost/iterator/iterator_adaptor.hpp>
-
-# ifndef BOOST_NO_SFINAE
-#  include <boost/type_traits/is_convertible.hpp>
-#  include <boost/utility/enable_if.hpp>
-# endif
+# include <type_traits>
 
 template <class Value>
 class node_iter
@@ -38,12 +34,10 @@ class node_iter
     template <class OtherValue>
     node_iter(
         node_iter<OtherValue> const& other
-# ifndef BOOST_NO_SFINAE
-      , typename boost::enable_if<
-            boost::is_convertible<OtherValue*,Value*>
+      , typename std::enable_if<
+            std::is_convertible<OtherValue*,Value*>::value
           , enabler
         >::type = enabler()
-# endif
     )
       : super_t(other.base()) {}
 

include/boost/indirect_reference.hpp

@@ -13,7 +13,6 @@
 
 # include <boost/detail/is_incrementable.hpp>
 # include <boost/iterator/iterator_traits.hpp>
-# include <boost/type_traits/remove_cv.hpp>
 # include <boost/mpl/eval_if.hpp>
 # include <boost/pointee.hpp>
 

include/boost/iterator/counting_iterator.hpp

@@ -5,19 +5,14 @@
 #ifndef COUNTING_ITERATOR_DWA200348_HPP
 # define COUNTING_ITERATOR_DWA200348_HPP
 
+# include <type_traits>
+
 # include <boost/config.hpp>
-# include <boost/static_assert.hpp>
+# include <boost/detail/workaround.hpp>
 # ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 # include <limits>
-# elif !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
-# include <boost/type_traits/is_convertible.hpp>
-# else
-# include <boost/type_traits/is_arithmetic.hpp>
 # endif
-# include <boost/type_traits/is_integral.hpp>
 # include <boost/type_traits/type_identity.hpp>
-# include <boost/type_traits/conditional.hpp>
-# include <boost/type_traits/integral_constant.hpp>
 # include <boost/detail/numeric_traits.hpp>
 # include <boost/iterator/iterator_adaptor.hpp>
 
@@ -39,7 +34,7 @@ namespace detail
   struct is_numeric_impl
   {
       // For a while, this wasn't true, but we rely on it below. This is a regression assert.
-      BOOST_STATIC_ASSERT(::boost::is_integral<char>::value);
+      static_assert(std::is_integral<char>::value, "std::is_integral<char> is expected to be true");
 
 # ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 
@@ -50,19 +45,19 @@ namespace detail
 #  if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
       BOOST_STATIC_CONSTANT(
           bool, value = (
-              boost::is_convertible<int,T>::value
-           && boost::is_convertible<T,int>::value
+              std::is_convertible<int,T>::value
+           && std::is_convertible<T,int>::value
       ));
 #  else
-      BOOST_STATIC_CONSTANT(bool, value = ::boost::is_arithmetic<T>::value);
+      BOOST_STATIC_CONSTANT(bool, value = std::is_arithmetic<T>::value);
 #  endif
 
 # endif
   };
 
   template <class T>
   struct is_numeric
-    : boost::integral_constant<bool, ::boost::iterators::detail::is_numeric_impl<T>::value>
+    : std::integral_constant<bool, ::boost::iterators::detail::is_numeric_impl<T>::value>
   {};
 
 #  if defined(BOOST_HAS_LONG_LONG)
@@ -116,7 +111,7 @@ namespace detail
   {
       typedef typename detail::ia_dflt_help<
           CategoryOrTraversal
-        , typename boost::conditional<
+        , typename std::conditional<
               is_numeric<Incrementable>::value
             , boost::type_identity<random_access_traversal_tag>
             , iterator_traversal<Incrementable>
@@ -125,7 +120,7 @@ namespace detail
 
       typedef typename detail::ia_dflt_help<
           Difference
-        , typename boost::conditional<
+        , typename std::conditional<
               is_numeric<Incrementable>::value
             , numeric_difference<Incrementable>
             , iterator_difference<Incrementable>
@@ -225,7 +220,7 @@ class counting_iterator
     difference_type
     distance_to(counting_iterator<OtherIncrementable, CategoryOrTraversal, Difference> const& y) const
     {
-        typedef typename boost::conditional<
+        typedef typename std::conditional<
             detail::is_numeric<Incrementable>::value
           , detail::number_distance<difference_type, Incrementable, OtherIncrementable>
           , detail::iterator_distance<difference_type, Incrementable, OtherIncrementable>

include/boost/iterator/detail/config_def.hpp

@@ -46,7 +46,7 @@
 
 #endif
 
-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x5A0))                      \
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x5A0))                    \
     || (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER)) \
     || BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))                \
     || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
@@ -92,7 +92,7 @@
 #  define BOOST_NO_IS_CONVERTIBLE_TEMPLATE // The following program fails to compile:
 
 #  if 0 // test code
-    #include <boost/type_traits/is_convertible.hpp>
+    #include <type_traits>
     template <class T>
     struct foo
     {
@@ -104,13 +104,13 @@
         T p;
     };
 
-    bool x = boost::is_convertible<foo<int const*>, foo<int*> >::value;
+    bool x = std::is_convertible<foo<int const*>, foo<int*> >::value;
 #  endif
 
 #endif
 
 
-#if !defined(BOOST_MSVC) && (defined(BOOST_NO_SFINAE) || defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_IS_CONVERTIBLE_TEMPLATE))
+#if !defined(BOOST_MSVC) && (defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_IS_CONVERTIBLE_TEMPLATE))
 # define BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
 #endif
 

include/boost/iterator/detail/facade_iterator_category.hpp

@@ -10,16 +10,10 @@
 
 # include <boost/mpl/or.hpp>  // used in iterator_tag inheritance logic
 # include <boost/mpl/and.hpp>
-# include <boost/mpl/if.hpp>
 # include <boost/mpl/eval_if.hpp>
 # include <boost/mpl/identity.hpp>
 
-# include <boost/static_assert.hpp>
-
-# include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/is_const.hpp>
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/is_convertible.hpp>
+# include <type_traits>
 
 # include <boost/iterator/detail/config_def.hpp> // try to keep this last
 
@@ -84,24 +78,24 @@ template <class Traversal, class ValueParam, class Reference>
 struct iterator_facade_default_category
   : mpl::eval_if<
         mpl::and_<
-            is_reference<Reference>
-          , is_convertible<Traversal,forward_traversal_tag>
+            std::is_reference<Reference>
+          , std::is_convertible<Traversal,forward_traversal_tag>
         >
       , mpl::eval_if<
-            is_convertible<Traversal,random_access_traversal_tag>
+            std::is_convertible<Traversal,random_access_traversal_tag>
           , mpl::identity<std::random_access_iterator_tag>
           , mpl::if_<
-                is_convertible<Traversal,bidirectional_traversal_tag>
+                std::is_convertible<Traversal,bidirectional_traversal_tag>
               , std::bidirectional_iterator_tag
               , std::forward_iterator_tag
             >
         >
       , typename mpl::eval_if<
             mpl::and_<
-                is_convertible<Traversal, single_pass_traversal_tag>
+                std::is_convertible<Traversal, single_pass_traversal_tag>
 
                 // check for readability
-              , is_convertible<Reference, ValueParam>
+              , std::is_convertible<Reference, ValueParam>
             >
           , mpl::identity<std::input_iterator_tag>
           , mpl::identity<Traversal>
@@ -114,15 +108,15 @@ struct iterator_facade_default_category
 template <class T>
 struct is_iterator_category
   : mpl::or_<
-        is_convertible<T,std::input_iterator_tag>
-      , is_convertible<T,std::output_iterator_tag>
+        std::is_convertible<T,std::input_iterator_tag>
+      , std::is_convertible<T,std::output_iterator_tag>
     >
 {
 };
 
 template <class T>
 struct is_iterator_traversal
-  : is_convertible<T,incrementable_traversal_tag>
+  : std::is_convertible<T,incrementable_traversal_tag>
 {};
 
 //
@@ -138,17 +132,19 @@ struct iterator_category_with_traversal
     // Make sure this isn't used to build any categories where
     // convertibility to Traversal is redundant.  Should just use the
     // Category element in that case.
-    BOOST_STATIC_ASSERT((
-        !is_convertible<
+    static_assert(
+        !std::is_convertible<
               typename iterator_category_to_traversal<Category>::type
             , Traversal
-          >::value));
+         >::value,
+        "Category transformed to corresponding traversal must be convertible to Traversal."
+    );
 
-    BOOST_STATIC_ASSERT(is_iterator_category<Category>::value);
-    BOOST_STATIC_ASSERT(!is_iterator_category<Traversal>::value);
-    BOOST_STATIC_ASSERT(!is_iterator_traversal<Category>::value);
+    static_assert(is_iterator_category<Category>::value, "Category must be an STL iterator category.");
+    static_assert(!is_iterator_category<Traversal>::value, "Traversal must not be an STL iterator category.");
+    static_assert(!is_iterator_traversal<Category>::value, "Category must not be a traversal tag.");
 #  if !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
-    BOOST_STATIC_ASSERT(is_iterator_traversal<Traversal>::value);
+    static_assert(is_iterator_traversal<Traversal>::value, "Traversal must be a traversal tag.");
 #  endif
 };
 
@@ -157,17 +153,17 @@ struct iterator_category_with_traversal
 template <class Traversal, class ValueParam, class Reference>
 struct facade_iterator_category_impl
 {
-    BOOST_STATIC_ASSERT(!is_iterator_category<Traversal>::value);
+    static_assert(!is_iterator_category<Traversal>::value, "Traversal must not be an STL iterator category.");
 
     typedef typename iterator_facade_default_category<
         Traversal,ValueParam,Reference
     >::type category;
 
-    typedef typename mpl::if_<
-        is_same<
+    typedef typename std::conditional<
+        std::is_same<
             Traversal
           , typename iterator_category_to_traversal<category>::type
-        >
+        >::value
       , category
       , iterator_category_with_traversal<category,Traversal>
     >::type type;