oh well

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

diff --git a/src/mathed/math_mathmlstream.C b/src/mathed/math_mathmlstream.C
index 8aed771f0bdc8582c436b38360d60fdae2f98a81..a10691ea1b53412e39fbf64a438445bcf7878110 100644 (file)
--- a/src/mathed/math_mathmlstream.C
+++ b/src/mathed/math_mathmlstream.C
@@ -4,11 +4,13 @@
 #include "math_inset.h"
 #include "math_extern.h"
 #include "debug.h"
+#include "support/lyxalgo.h"
 
-#include <algorithm>
 
+using std::ostream;
 
-MathMLStream::MathMLStream(std::ostream & os)
+
+MathMLStream::MathMLStream(ostream & os)
        : os_(os), tab_(0), line_(0), lastchar_(0)
 {}
 
@@ -147,6 +149,13 @@ OctaveStream & operator<<(OctaveStream & ns, char c)
 }
 
 
+OctaveStream & operator<<(OctaveStream & ns, int i)
+{
+       ns.os() << i;
+       return ns;
+}
+
+
 //////////////////////////////////////////////////////////////////////
 
 
@@ -185,13 +194,13 @@ NormalStream & operator<<(NormalStream & ns, char c)
 //////////////////////////////////////////////////////////////////////
 
 
-WriteStream::WriteStream(std::ostream & os, bool fragile)
-       : os_(os), fragile_(fragile), firstitem_(false), line_(0)
+WriteStream::WriteStream(ostream & os, bool fragile, bool latex)
+       : os_(os), fragile_(fragile), latex_(latex), firstitem_(false), line_(0)
 {}
 
 
-WriteStream::WriteStream(std::ostream & os)
-       : os_(os), fragile_(false), firstitem_(false), line_(0)
+WriteStream::WriteStream(ostream & os)
+       : os_(os), fragile_(false), latex_(false), firstitem_(false), line_(0)
 {}
 
 
@@ -221,7 +230,7 @@ WriteStream & operator<<(WriteStream & ws, MathArray const & ar)
 WriteStream & operator<<(WriteStream & ws, char const * s)
 {
        ws.os() << s;
-       ws.addlines(std::count(s, s + strlen(s), '\n'));
+       ws.addlines(int(lyx::count(s, s+strlen(s), '\n')));
        return ws;
 }