Update Win installer for new dictionary links. Untested.

[lyx.git] / src / CoordCache.h

diff --git a/src/CoordCache.h b/src/CoordCache.h
index 38842be83cb0fa6f2ad81e5920912abf2a170f8e..f960c24b1bd6e1aa8a945ce1230613f7aa9bbf39 100644 (file)
--- 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_;
 };