Don't allow newline characters in document settings.

[lyx.git] / boost / boost / iterator / filter_iterator.hpp

diff --git a/boost/boost/iterator/filter_iterator.hpp b/boost/boost/iterator/filter_iterator.hpp
index 96fb84359f6cd9ff1ddf4d873dd7c0ae9f94efd3..14d640bf0939c491f3829f0cbd826a5e24e2ae17 100644 (file)
--- a/boost/boost/iterator/filter_iterator.hpp
+++ b/boost/boost/iterator/filter_iterator.hpp
@@ -53,14 +53,14 @@ namespace boost
    public:
       filter_iterator() { }
 
-      filter_iterator(Predicate f, Iterator x, Iterator end = Iterator())
-          : super_t(x), m_predicate(f), m_end(end)
+      filter_iterator(Predicate f, Iterator x, Iterator end_ = Iterator())
+          : super_t(x), m_predicate(f), m_end(end_)
       {
           satisfy_predicate();
       }
 
-      filter_iterator(Iterator x, Iterator end = Iterator())
-        : super_t(x), m_predicate(), m_end(end)
+      filter_iterator(Iterator x, Iterator end_ = Iterator())
+        : super_t(x), m_predicate(), m_end(end_)
       {
         // Pro8 is a little too aggressive about instantiating the
         // body of this function.
@@ -122,7 +122,7 @@ namespace boost
         , Iterator
       >::type x
     , Iterator end = Iterator()
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
     , Predicate* = 0
 #endif 
   )