boost 1.30.2

[lyx.git] / boost / boost / format / parsing.hpp

diff --git a/boost/boost/format/parsing.hpp b/boost/boost/format/parsing.hpp
index c9b7bf5f58fa13f96464bda35920bcfcc5168c92..1e75392d9bcb8b6e83f22b64075111d1aef95dde 100644 (file)
--- a/boost/boost/format/parsing.hpp
+++ b/boost/boost/format/parsing.hpp
@@ -34,7 +34,7 @@ namespace detail {
   template<class Ch, class Stream> inline
   bool wrap_isdigit(Ch c, Stream &os) 
   {
-#ifndef BOOST_BAD_ISDIGIT
+#ifndef BOOST_NO_LOCALE_ISIDIGIT
     return std::isdigit(c, os.rdbuf()->getloc() );
 # else
     using namespace std;
@@ -361,7 +361,7 @@ void basic_format<Ch, Traits> ::parse(const string_t & buf)
     
     // A: find upper_bound on num_items and allocates arrays
     i1=0; 
-    while( (i1=buf.find(arg_mark,i1)) != string::npos ) 
+    while( (i1=buf.find(arg_mark,i1)) != string_t::npos ) 
     {
       if( i1+1 >= buf.size() ) {
         if(exceptions() & io::bad_format_string_bit)
@@ -385,7 +385,7 @@ void basic_format<Ch, Traits> ::parse(const string_t & buf)
     typename string_t::size_type i0 = i1;
     bool special_things=false;
     int cur_it=0;
-    while( (i1=buf.find(arg_mark,i1)) != string::npos ) 
+    while( (i1=buf.find(arg_mark,i1)) != string_t::npos ) 
     {
       string_t & piece = (cur_it==0) ? prefix_ : items_[cur_it-1].appendix_;