Wininstaller2: refresh PATH before running configure

[features.git] / 3rdparty / boost / boost / regex / v4 / fileiter.hpp

diff --git a/3rdparty/boost/boost/regex/v4/fileiter.hpp b/3rdparty/boost/boost/regex/v4/fileiter.hpp
index 4873a0a85e14bfc12a734457c1150e70108a7bf5..7c865c63098dcf2f52b3dfa2eaed74b48a97277a 100644 (file)
--- a/3rdparty/boost/boost/regex/v4/fileiter.hpp
+++ b/3rdparty/boost/boost/regex/v4/fileiter.hpp
@@ -195,9 +195,6 @@ public:
 };
 
 class BOOST_REGEX_DECL mapfile_iterator
-#if !defined(BOOST_NO_STD_ITERATOR) || defined(BOOST_MSVC_STD_ITERATOR)
-: public std::iterator<std::random_access_iterator_tag, char>
-#endif
 {
    typedef mapfile::pointer internal_pointer;
    internal_pointer* node;
@@ -225,11 +222,11 @@ public:
    mapfile_iterator() { node = 0; file = 0; offset = 0; }
    mapfile_iterator(const mapfile* f, long arg_position)
    {
+      BOOST_ASSERT(f);
       file = f;
       node = f->_first + arg_position / mapfile::buf_size;
       offset = arg_position % mapfile::buf_size;
-      if(file)
-         file->lock(node);
+      file->lock(node);
    }
    mapfile_iterator(const mapfile_iterator& i)
    {