... and RELEASE-NOTES

[lyx.git] / src / mathed / InsetMathNest.h

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 4e18dbda71e25d787945371e654213922e212474..b9cc1f66d48967b076f744084e381b23ef0a6bd5 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -14,9 +14,6 @@
 
 #include "InsetMath.h"
 
-// FIXME: remove
-#include "support/docstring.h"
-
 #include <map>
 
 namespace lyx {
@@ -35,9 +32,17 @@ public:
        ///
        void setBuffer(Buffer &);
 
+       // The method below hides inset::metrics() intentionally!
+       // We have to tell clang not to be fussy about that.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#endif
        /// the size is usually some sort of convex hull of the cells
-       /// hides inset::metrics() intentionally!
        void metrics(MetricsInfo const & mi) const;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
        /// draw background if locked
        void draw(PainterInfo & pi, int x, int y) const;
        /// draw selection background
@@ -172,7 +177,7 @@ public:
        /// interpret \p str and insert the result at the current position of
        /// \p cur if it is something known. Return whether \p cur was
        /// inserted.
-       bool interpretString(Cursor & cur, docstring const & str);
+       virtual bool interpretString(Cursor & cur, docstring const & str);
 
 private:
        /// lfun handler