X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=dedd1355b677e3af008c314059238855ed9569a4;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=0ea79a39162921ee7154f962c8ffc5a5a51b7c5a;hpb=7f461f4392a19cf488dec005d2f12cfea83655d9;p=lyx.git

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 0ea79a3916..dedd1355b6 100644
--- a/src/CoordCache.cpp
+++ b/src/CoordCache.cpp
@@ -2,7 +2,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -18,7 +18,7 @@
 
 #include "insets/Inset.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 
 namespace lyx {
@@ -26,18 +26,19 @@ namespace lyx {
 Point::Point(int x, int y)
 	: x_(x), y_(y)
 {
-	LASSERT(x > -1000000, /**/);
-	LASSERT(x <  1000000, /**/);
-	LASSERT(y > -1000000, /**/);
-	LASSERT(y <  1000000, /**/);
+	LASSERT(x > -1000000, x = -1000000);
+	LASSERT(x <  1000000, x =  1000000);
+	LASSERT(y > -1000000, y = -1000000);
+	LASSERT(y <  1000000, y =  1000000);
 }
 
+
 // just a helper to be able to set a breakpoint
 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 +52,14 @@ void CoordCache::clear()
 void CoordCache::dump() const
 {
 	LYXERR0("InsetCache contains:");
-	for (CoordCacheBase<Inset>::cache_type::const_iterator it = getInsets().getData().begin(); it != getInsets().getData().end(); ++it) {
-		Inset const * inset = it->first;
+	CoordCacheBase<Inset>::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_);
 	}
 }