Index: boost/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/ChangeLog,v
retrieving revision 1.26
diff -u -p -r1.26 ChangeLog
--- boost/ChangeLog	28 Jul 2002 23:38:36 -0000	1.26
+++ boost/ChangeLog	6 Aug 2002 10:46:03 -0000
@@ -1,3 +1,10 @@
+2002-07-30  Angus Leeming  <leeming@lyx.org>
+
+	Reapplied:
+	* boost/signals/connection.hpp:
+	* libs/signals/src/connection.cpp: c-assert expects an int, so don't
+	pass it a pointer.
+
 2002-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* update boost
Index: boost/boost/signals/connection.hpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/signals/connection.hpp,v
retrieving revision 1.6
diff -u -p -r1.6 connection.hpp
--- boost/boost/signals/connection.hpp	28 Jul 2002 23:38:38 -0000	1.6
+++ boost/boost/signals/connection.hpp	6 Aug 2002 10:46:03 -0000
@@ -151,7 +151,7 @@ namespace boost {
     inline void
     connection::add_bound_object(const BOOST_SIGNALS_NAMESPACE::detail::bound_object& b)
     {
-      assert(con.get());
+      assert(con.get() != 0);
       con->bound_objects.push_back(b);
     }
 
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.5
diff -u -p -r1.5 connection.cpp
--- boost/libs/signals/src/connection.cpp	28 Jul 2002 23:38:39 -0000	1.5
+++ boost/libs/signals/src/connection.cpp	6 Aug 2002 10:46:04 -0000
@@ -39,7 +39,7 @@ namespace boost {
         typedef std::list<BOOST_SIGNALS_NAMESPACE::detail::bound_object>::iterator iterator;
         for (iterator i = local_con->bound_objects.begin(); 
              i != local_con->bound_objects.end(); ++i) {
-          assert(i->disconnect);
+          assert(i->disconnect != 0);
           i->disconnect(i->obj, i->data);
         }
       }