We only support gcc >= 4.9.

[lyx.git] / src / mathed / InsetMathMacroTemplate.cpp

diff --git a/src/mathed/InsetMathMacroTemplate.cpp b/src/mathed/InsetMathMacroTemplate.cpp
index 1152936ee2e784f64b0ae7c49d654792bc3b78ba..3525ba4e8c6f03d77c4ae31f00ca56907bc8f918 100644 (file)
--- a/src/mathed/InsetMathMacroTemplate.cpp
+++ b/src/mathed/InsetMathMacroTemplate.cpp
@@ -216,13 +216,13 @@ Inset * InsetDisplayLabelBox::clone() const
 }
 
 
-InsetMath::marker_type InsetDisplayLabelBox::marker(BufferView const * bv) const
+marker_type InsetDisplayLabelBox::marker(BufferView const * bv) const
 {
        if (parent_.editing(bv)
            || !parent_.cell(parent_.displayIdx()).empty())
-               return MARKER;
+               return marker_type::MARKER;
        else
-               return NO_MARKER;
+               return marker_type::NO_MARKER;
 }
 
 
@@ -573,7 +573,7 @@ void InsetMathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
        if (macro)
                macro->unlock();
 
-       dim.wid += leftOffset(mi.base.bv) + rightOffset(mi.base.bv);;
+       dim.wid += leftOffset(mi.base.bv) + rightOffset(mi.base.bv);
        dim.des += bottomOffset(mi.base.bv);
        dim.asc += topOffset(mi.base.bv);
 }
@@ -1170,20 +1170,20 @@ void InsetMathMacroTemplate::write(ostream & os) const
 {
        odocstringstream oss;
        otexrowstream ots(oss);
-       WriteStream wi(ots, false, false, WriteStream::wsDefault);
+       TeXMathStream wi(ots, false, false, TeXMathStream::wsDefault);
        oss << "FormulaMacro\n";
        write(wi);
        os << to_utf8(oss.str());
 }
 
 
-void InsetMathMacroTemplate::write(WriteStream & os) const
+void InsetMathMacroTemplate::write(TeXMathStream & os) const
 {
        write(os, false);
 }
 
 
-int InsetMathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const
+int InsetMathMacroTemplate::write(TeXMathStream & os, bool overwriteRedefinition) const
 {
        int num_lines = 0;