X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Ftokenizer.hpp;h=081e5ba2f7cfd983ece7cb931529a7d8e11df4a2;hb=43c09d723435a5b203f2ac0c39e2086de836b386;hp=336c717aac59d528800f04d9ef55803001e0d0dc;hpb=59b6a4701a8d2b5155af08cf758b4ca120201282;p=lyx.git

diff --git a/boost/boost/tokenizer.hpp b/boost/boost/tokenizer.hpp
index 336c717aac..081e5ba2f7 100644
--- a/boost/boost/tokenizer.hpp
+++ b/boost/boost/tokenizer.hpp
@@ -1,25 +1,24 @@
 // Boost tokenizer.hpp  -----------------------------------------------------//
 
-// © Copyright Jeremy Siek and John R. Bandela 2001. 
+// (c) Copyright Jeremy Siek and John R. Bandela 2001. 
 
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
-// See http://www.boost.org for updates, documentation, and revision history.
+// See http://www.boost.org/libs/tokenizer for documenation
 
 // Revision History:
-
+// 03 Jul 2003   John Bandela
+//      Converted to new iterator adapter
 // 02 Feb 2002   Jeremy Siek
 //      Removed tabs and a little cleanup.
 
-#ifndef BOOST_TOKENIZER_JRB051801_HPP_
-#define BOOST_TOKENIZER_JRB051801_HPP_
+#ifndef BOOST_TOKENIZER_JRB070303_HPP_
+#define BOOST_TOKENIZER_JRB070303_HPP_
 
 #include <boost/token_iterator.hpp>
-#include <cassert>
+
 namespace boost {
 
   
@@ -32,8 +31,6 @@ namespace boost {
   >
   class tokenizer {
   private:
-    typedef detail::tokenizer_policy<Type, TokenizerFunc> Pol;
-    typedef detail::token_iterator_base<Iterator> TBase;
     typedef token_iterator_generator<TokenizerFunc,Iterator,Type> TGen;
         
     // It seems that MSVC does not like the unqualified use of iterator,
@@ -86,8 +83,8 @@ namespace boost {
       assign(c.begin(),c.end(),f);
     }
     
-    iter begin() const { return iter(TBase(first_,last_),Pol(f_)); }
-    iter end() const { return iter(TBase(last_,last_),Pol(f_)); }
+    iter begin() const { return iter(f_,first_,last_); }
+    iter end() const { return iter(f_,last_,last_); }
         
   private:
     Iterator first_;