From 84bbe81f3daffd92a3e4d1c461b0bedfacc5b22c Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 18 Jun 2002 19:55:23 +0000 Subject: [PATCH] Reapply "c-assert expects an int" patch. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4422 a592a061-630c-0410-9148-cb99ea01b6c8 --- boost/ChangeLog | 7 +++++++ boost/boost/signals/connection.hpp | 2 +- boost/libs/signals/src/connection.cpp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/boost/ChangeLog b/boost/ChangeLog index 013bcb3cc9..dd4ec3d7df 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,10 @@ +2002-06-18 Angus Leeming + + 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 * update boost. (prev commit lost). diff --git a/boost/boost/signals/connection.hpp b/boost/boost/signals/connection.hpp index e032ab8b85..3381c99ad7 100644 --- 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 d30d69cc6b..3f7020a054 100644 --- a/boost/libs/signals/src/connection.cpp +++ b/boost/libs/signals/src/connection.cpp @@ -39,7 +39,7 @@ 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); + assert(i->disconnect != 0); i->disconnect(i->obj, i->data); } } -- 2.39.2