David Abrahams <[EMAIL PROTECTED]> writes:

| I have put a diff of the changes between Version_1_30_0 and RC_1_30_0
| at http://www.boost-consulting.com/diffs-1-30-1.txt.

These are the changes we (LyX Developers) have made to boost 1.30.0 to
make it compile with gcc 3.3 without warnings, as well as using a
different string class than std::string¹.

If appropriate, please include these changes in 1.30.1.

¹ Actually we are using both a lyx::string and std::string at the same
time only one of which is brought into the global namespace.

Index: boost/config/compiler/gcc.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/config/compiler/gcc.hpp,v
retrieving revision 1.15
diff -u -p -r1.15 gcc.hpp
--- boost/config/compiler/gcc.hpp	30 Jan 2003 18:13:55 -0000	1.15
+++ boost/config/compiler/gcc.hpp	2 Aug 2003 11:10:34 -0000
@@ -58,8 +58,8 @@
 #  error "Compiler not configured - please reconfigure"
 #endif
 //
-// last known and checked version is 3.2:
-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2))
+// last known and checked version is 3.3:
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else
Index: boost/format/parsing.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/format/parsing.hpp,v
retrieving revision 1.16.2.1
diff -u -p -r1.16.2.1 parsing.hpp
--- boost/format/parsing.hpp	19 Mar 2003 17:05:20 -0000	1.16.2.1
+++ boost/format/parsing.hpp	2 Aug 2003 11:10:34 -0000
@@ -361,7 +361,7 @@ void basic_format<Ch, Traits> ::parse(co
     
     // 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(co
     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_;
 
Index: libs/regex/src/c_regex_traits.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/regex/src/c_regex_traits.cpp,v
retrieving revision 1.36
diff -u -p -r1.36 c_regex_traits.cpp
--- libs/regex/src/c_regex_traits.cpp	21 Feb 2003 12:43:49 -0000	1.36
+++ libs/regex/src/c_regex_traits.cpp	2 Aug 2003 11:10:50 -0000
@@ -514,9 +514,9 @@ void BOOST_REGEX_CALL c_traits_base::do_
       if(std::isxdigit(i))
          class_map[i] |= char_class_xdigit;
    }
-   class_map['_'] |= char_class_underscore;
-   class_map[' '] |= char_class_blank;
-   class_map['\t'] |= char_class_blank;
+   class_map[(unsigned char)'_'] |= char_class_underscore;
+   class_map[(unsigned char)' '] |= char_class_blank;
+   class_map[(unsinged char)'\t'] |= char_class_blank;
    for(i = 0; i < map_size; ++i)
    {
       lower_case_map[i] = (char)std::tolower(i);
Index: libs/regex/src/cpp_regex_traits.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/regex/src/cpp_regex_traits.cpp,v
retrieving revision 1.30
diff -u -p -r1.30 cpp_regex_traits.cpp
--- libs/regex/src/cpp_regex_traits.cpp	16 Sep 2002 11:54:41 -0000	1.30
+++ libs/regex/src/cpp_regex_traits.cpp	2 Aug 2003 11:10:50 -0000
@@ -241,7 +241,7 @@ message_data<char>::message_data(const s
 #endif
       for(std::size_t j = 0; j < s.size(); ++j)
       {
-         syntax_map[s[j]] = (unsigned char)(i);
+         syntax_map[(unsigned char)s[j]] = (unsigned char)(i);
       }
    }
 
-- 
        Lgb
_______________________________________________
Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost

Reply via email to