Account for old versions of Pygments

[lyx.git] / src / CoordCache.cpp

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 38baabf80581dac1f6a90966441b4344f08447d2..62c970a956c83de610a9365c2085a580b1c585da 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.
  */
@@ -10,32 +10,25 @@
 #include <config.h>
 
 #include "CoordCache.h"
-#include "debug.h"
 
 #include "Text.h"
 
+#include "support/debug.h"
+#include "support/docstring.h"
+
 #include "insets/Inset.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 
 namespace lyx {
 
-Point::Point(int x, int y)
-       : x_(x), y_(y)
-{
-       BOOST_ASSERT(x > -1000000);
-       BOOST_ASSERT(x <  1000000);
-       BOOST_ASSERT(y > -1000000);
-       BOOST_ASSERT(y <  1000000);
-}
-
 // just a helper to be able to set a breakpoint
 void lyxbreaker(void const * data, const char * hint, int size)
 {
-       lyxerr << "break on pointer: " << data << " hint: " << hint
-               << " size: " << size << std::endl;
-       BOOST_ASSERT(false);
+       LYXERR0("break on pointer: " << data << " hint: " << hint
+               << " size: " << size);
+       LBUFERR(false);
 }
 
 
@@ -43,19 +36,25 @@ void CoordCache::clear()
 {
        arrays_.clear();
        insets_.clear();
-       slices0_.clear();
-       slices1_.clear();
 }
 
 
 void CoordCache::dump() const
 {
-       lyxerr << "InsetCache contains:" << std::endl;
-       for (CoordCacheBase<Inset>::cache_type::const_iterator it = getInsets().getData().begin(); it != getInsets().getData().end(); ++it) {
-               Inset const * inset = it->first;
-               Point const p = it->second;
-               lyxerr << "Inset " << inset << "(" << to_utf8(inset->name())
-                       << ") has point " << p.x_ << "," << p.y_ << std::endl;
+       if (getInsets().data_.empty()) {
+               LYXERR0("InsetCache is empty.");
+               return;
+       }
+
+       LYXERR0("InsetCache contains:");
+       CoordCache::Insets::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 << " has point " << p.x_ << "," << p.y_);
        }
 }