[PATCH]: boost

[Angus Leeming]

* Fixes a warning on a 64 bit machine (pointers being of size 8 and ints of 
size 4...)
* Enables compilation of a templatised function with this compiler (and 
appears to be the right fix anyhow.)

Ok to apply?

Angus

Index: boost/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/ChangeLog,v
retrieving revision 1.22
diff -u -p -r1.22 ChangeLog
--- boost/ChangeLog	3 Jun 2002 18:58:49 -0000	1.22
+++ boost/ChangeLog	12 Jun 2002 13:03:45 -0000
@@ -1,3 +1,13 @@
+2002-06-12  Angus Leeming  <[EMAIL PROTECTED]>
+
+	* boost/signals/connection.hpp:
+	* libs/signals/src/connection.cpp: c-assert expects an int, so don't
+	pass it a pointer.
+
+	* libs/regex/src/c_regex_traits.cpp (re_get_message): use the
+	appropriate char type in this templatised function. Ie, replace wchar_t
+	with charT.
+
 2002-06-03  Lars Gullik Bjønnes  <[EMAIL PROTECTED]>
 
 	* libs/regex/src/Makefile.am: only compile the source files that
Index: boost/boost/signals/connection.hpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/signals/connection.hpp,v
retrieving revision 1.2
diff -u -p -r1.2 connection.hpp
--- boost/boost/signals/connection.hpp	28 May 2002 11:31:39 -0000	1.2
+++ boost/boost/signals/connection.hpp	12 Jun 2002 13:03:46 -0000
@@ -151,7 +151,8 @@ namespace boost {
     inline void 
     connection::add_bound_object(const signals::detail::bound_object& b)
     {
-      assert(con.get());
+      // c-assert expects an int, so don't pass it a pointer
+      assert(con.get() != 0);
       con->bound_objects.push_back(b);
     }
 
Index: boost/libs/regex/src/c_regex_traits.cpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/c_regex_traits.cpp,v
retrieving revision 1.1
diff -u -p -r1.1 c_regex_traits.cpp
--- boost/libs/regex/src/c_regex_traits.cpp	24 May 2002 12:53:11 -0000	1.1
+++ boost/libs/regex/src/c_regex_traits.cpp	12 Jun 2002 13:03:46 -0000
@@ -189,7 +189,7 @@ std::size_t BOOST_REGEX_CALL re_get_mess
       return size;
    boost::scoped_array<char> cb(new char[size]);
    _re_get_message(cb.get(), size, id);
-   size = boost::c_regex_traits<wchar_t>::strwiden(buf, len, cb.get());
+   size = boost::c_regex_traits<charT>::strwiden(buf, len, cb.get());
    return size;
 }
 
Index: boost/libs/signals/src/connection.cpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/signals/src/connection.cpp,v
retrieving revision 1.1
diff -u -p -r1.1 connection.cpp
--- boost/libs/signals/src/connection.cpp	26 May 2002 13:02:17 -0000	1.1
+++ boost/libs/signals/src/connection.cpp	12 Jun 2002 13:03:46 -0000
@@ -39,7 +39,8 @@ namespace boost {
         typedef std::list<signals::detail::bound_object>::iterator iterator;
         for (iterator i = local_con->bound_objects.begin(); 
              i != local_con->bound_objects.end(); ++i) {
-          assert(i->disconnect);
+          // c-assert expects an int, so don't pass it a pointer
+          assert(i->disconnect != 0);
           i->disconnect(i->obj, i->data);
         }
       }