removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / mathed / math_macro.C

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 438720012b2a9317bb5f76cd81eca5e0b31a5ca1..f8aab671838b7034d1b2e93c0edadd712969bbc3 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -28,15 +28,24 @@
 #include "math_iter.h"
 #include "math_inset.h"
 #include "support/lstrings.h"
-#include "error.h"
+#include "debug.h"
 
 
+ostream & operator<<(ostream & o, MathedTextCodes mtc)
+{
+       return o << int(mtc);
+}
+
 enum MathedMacroFlag {
     MMF_Env=1,
     MMF_Exp=2,
     MMF_Edit=4
 };
 
+ostream & operator<<(ostream & o, MathedMacroFlag mmf)
+{
+       return o << int(mmf);
+}
 
 extern GC mathGC, mathFrameGC, latexGC;
 extern int mathed_string_width(short type, int style, byte const* s, int ls);
@@ -158,9 +167,8 @@ void MathMacro::Write(FILE *file)
 void MathMacro::Write(string &file)
 {
     if (tmplate->flags & MMF_Exp) {
-       lyxerr.debug(string("Expand ")+ tostr(tmplate->flags)
-                    + ' ' + tostr(MMF_Exp), 
-                    Error::MATHED);
+           lyxerr[Debug::MATHED] << "Expand " << tmplate->flags
+                                 << ' ' << MMF_Exp << endl; 
        tmplate->update(this);
        tmplate->Write(file);
     } else {
@@ -248,7 +256,7 @@ void MathMacroArgument::Write(string &file)
        MathParInset::Write(file);
     } else {
        file += '#';
-       file += number;
+       file += tostr(number);
        file += ' ';
     }
 }
@@ -380,7 +388,7 @@ void MathMacroTemplate::WriteDef(string &file)
       
     if (nargs > 0 ) {
       file += '[';
-      file += nargs;
+      file += tostr(nargs);
       file += ']';
     }
     
@@ -452,8 +460,8 @@ void MathMacroTable::addTemplate(MathMacroTemplate *m)
     if (num_macros<max_macros)
       macro_table[num_macros++] = m;
     else
-      lyxerr.print("Error (MathMacroTable::addTemplate): "
-                  "Macro table exhausted!");
+           lyxerr << "Error (MathMacroTable::addTemplate): "
+                   "Macro table exhausted!" << endl;
 }
 
 
@@ -471,7 +479,7 @@ void MathMacroTable::builtinMacros()
     
     built = true;
     
-    lyxerr.debug("Building macros", Error::MATHED);
+    lyxerr[Debug::MATHED] << "Building macros" << endl;
     
     // This macro doesn't have arguments
     m = new MathMacroTemplate("notin");  // this leaks