Allow autoconf 2.69 and automake 1.12

[lyx.git] / src / CoordCache.cpp

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 0ea79a39162921ee7154f962c8ffc5a5a51b7c5a..4c9e8800927058d6dd0548d92579e19be9eb1f59 100644 (file)
--- 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 {
@@ -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<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_);
        }
 }