X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.h;h=f960c24b1bd6e1aa8a945ce1230613f7aa9bbf39;hb=26ba2a65838731ce639a09539f617cb0f0be3b22;hp=38842be83cb0fa6f2ad81e5920912abf2a170f8e;hpb=2a594d3e90a673c56df9766658a79cf0bcaeb9a8;p=lyx.git

diff --git a/src/CoordCache.h b/src/CoordCache.h
index 38842be83c..f960c24b1b 100644
--- a/src/CoordCache.h
+++ b/src/CoordCache.h
@@ -16,7 +16,7 @@
 
 #include "Dimension.h"
 
-#include <map>
+#include <unordered_map>
 
 namespace lyx {
 
@@ -26,7 +26,7 @@ class MathData;
 void lyxbreaker(void const * data, const char * hint, int size);
 
 struct Geometry {
-	Point pos;
+	Point pos = {-10000, -10000 };
 	Dimension dim;
 
 	bool covers(int x, int y) const
@@ -77,14 +77,18 @@ public:
 
 	void add(T const * thing, Dimension const & dim)
 	{
-		if (!has(thing))
-			data_[thing].pos = Point(-10000, -10000);
 		data_[thing].dim = dim;
 	}
 
+	Geometry & geometry(T const * thing)
+	{
+		checkDim(thing, "geometry");
+		return data_.find(thing)->second;
+	}
+
 	Geometry const & geometry(T const * thing) const
 	{
-		check(thing, "geometry");
+		checkDim(thing, "geometry");
 		return data_.find(thing)->second;
 	}
 
@@ -143,6 +147,7 @@ public:
 private:
 	friend class CoordCache;
 
+#ifdef ENABLE_ASSERTIONS
 	void checkDim(T const * thing, char const * hint) const
 	{
 		if (!hasDim(thing))
@@ -154,8 +159,13 @@ private:
 		if (!has(thing))
 			lyxbreaker(thing, hint, data_.size());
 	}
+#else
+	void checkDim(T const *, char const * const ) const {}
+
+	void check(T const *, char const *) const {}
+#endif
 
-	typedef std::map<T const *, Geometry> cache_type;
+	typedef std::unordered_map<T const *, Geometry> cache_type;
 	cache_type data_;
 };