c-assert expects an int, so don't pass it a pointer.

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

diff --git a/boost/ChangeLog b/boost/ChangeLog
index 4655b94b53a1c652181ab8a04e163672ee32abe2..4129834984bdd74516853226243a1b6d0958f5ff 100644 (file)
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-12  Angus Leeming  <leeming@lyx.org>
+
+       * boost/signals/connection.hpp:
+       * libs/signals/src/connection.cpp: c-assert expects an int, so don't
+       pass it a pointer.
+
 2002-06-03  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * libs/regex/src/Makefile.am: only compile the source files that

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

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