X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=4c9e8800927058d6dd0548d92579e19be9eb1f59;hb=57a8ea32c0a2443c188a522b516100bb74ec4a8d;hp=56997467e8e05365b2e87b47da7977925023921e;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp index 56997467e8..4c9e880092 100644 --- a/src/CoordCache.cpp +++ b/src/CoordCache.cpp @@ -37,7 +37,7 @@ void lyxbreaker(void const * data, const char * hint, int size) { LYXERR0("break on pointer: " << data << " hint: " << hint << " size: " << size); - LASSERT(false, /**/); + LASSERT(false, return); } @@ -51,11 +51,14 @@ void CoordCache::clear() void CoordCache::dump() const { LYXERR0("InsetCache contains:"); - for (CoordCacheBase::cache_type::const_iterator it = getInsets().getData().begin(); it != getInsets().getData().end(); ++it) { - Inset const * inset = it->first; + CoordCacheBase::cache_type::const_iterator it = + getInsets().data_.begin(); + for (; it != getInsets().data_.end(); ++it) { + // Warning: it is not guaranteed that inset is a valid pointer + // (therefore it has type 'void *') (see bug #7376). + void const * inset = it->first; Point const p = it->second.pos; - LYXERR0("Inset " << inset << "(" << to_utf8(inset->name()) - << ") has point " << p.x_ << "," << p.y_); + LYXERR0("Inset " << inset << " has point " << p.x_ << "," << p.y_); } }