Reapply "c-assert expects an int" patch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4422 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/boost/ChangeLog b/boost/ChangeLog
index 013bcb3cc960a99dc63a859b94400045b835181d..dd4ec3d7dfddc927149afb520b2e96750736f6f9 100644 (file)
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-18  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-06-16  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * update boost. (prev commit lost).

diff --git a/boost/boost/signals/connection.hpp b/boost/boost/signals/connection.hpp
index e032ab8b85db85d2624941149a970c5c77288cc1..3381c99ad7bcd6d14c4c4df254c51f6263f76bf1 100644 (file)
--- a/boost/boost/signals/connection.hpp
+++ b/boost/boost/signals/connection.hpp
@@ -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);
     }
 

diff --git a/boost/libs/signals/src/connection.cpp b/boost/libs/signals/src/connection.cpp
index d30d69cc6b47b68215344c2b78f244a1bb334eab..3f7020a054b3dc9ad0a645f9c0996621b5be3ca0 100644 (file)
--- a/boost/libs/signals/src/connection.cpp
+++ b/boost/libs/signals/src/connection.cpp
@@ -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);
         }
       }