From 737a9ddcf4b6e75fc5469fa0a73ef648923cf342 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 13 Jun 2002 16:05:32 +0000 Subject: [PATCH] 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 --- boost/ChangeLog | 6 ++++++ boost/boost/signals/connection.hpp | 3 ++- boost/libs/signals/src/connection.cpp | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/boost/ChangeLog b/boost/ChangeLog index 4655b94b53..4129834984 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,9 @@ +2002-06-12 Angus Leeming + + * 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 * 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 cbd47e29cf..19f149c545 100644 --- 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 c1233e8b9a..c8f51c0126 100644 --- a/boost/libs/signals/src/connection.cpp +++ b/boost/libs/signals/src/connection.cpp @@ -39,7 +39,8 @@ namespace boost { typedef std::list::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); } }