import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / regex / v4 / regex_format.hpp

diff --git a/ceph/src/boost/boost/regex/v4/regex_format.hpp b/ceph/src/boost/boost/regex/v4/regex_format.hpp
index f0a0a11e40c484ad50490decdfc74c5fe48fbf4d..b65ffcc9ccdefa5691fe5eb65ed742feeee504a3 100644 (file)
--- a/ceph/src/boost/boost/regex/v4/regex_format.hpp
+++ b/ceph/src/boost/boost/regex/v4/regex_format.hpp
@@ -800,9 +800,6 @@ void basic_regex_formatter<OutputIterator, Results, traits, ForwardIter>::put(co
 
 template <class S>
 class string_out_iterator
-#ifndef BOOST_NO_STD_ITERATOR
-   : public std::iterator<std::output_iterator_tag, typename S::value_type>
-#endif
 {
    S* out;
 public:
@@ -816,13 +813,11 @@ public:
       return *this; 
    }
 
-#ifdef BOOST_NO_STD_ITERATOR
    typedef std::ptrdiff_t difference_type;
    typedef typename S::value_type value_type;
    typedef value_type* pointer;
    typedef value_type& reference;
    typedef std::output_iterator_tag iterator_category;
-#endif
 };
 
 template <class OutputIterator, class Iterator, class Alloc, class ForwardIter, class traits>