Reapply "c-assert expects an int" patch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4422 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-06-18 19:55:23 +00:00
parent 831361e4b6
commit 84bbe81f3d
3 changed files with 9 additions and 2 deletions

View File

@ -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).

View File

@ -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);
}

View File

@ -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);
}
}