lyxserver cleanup patch + andre's small patches

[lyx.git] / src / support / lyxmanip.h

diff --git a/src/support/lyxmanip.h b/src/support/lyxmanip.h
index 75e6c4e04d008f46cfbb3c7f0450f461b0c24337..9c066eaab342d17d5160e4f4581251b38d40b141 100644 (file)
--- a/src/support/lyxmanip.h
+++ b/src/support/lyxmanip.h
@@ -2,7 +2,7 @@
 #ifndef LYX_MANIP_H
 #define LYX_MANIP_H
 
-#include <iostream>
+#include "support/LOstream.h"
 
 ///
 struct NewLineAndDepth_ {
@@ -17,12 +17,16 @@ NewLineAndDepth_ newlineAndDepth(int n)
        nlad_.depth_ = n;
        return nlad_;
 }
+
 ///
 inline
-ostream & operator<<(ostream & os, NewLineAndDepth_ const & nlad_)
+std::ostream & operator<<(std::ostream & os, NewLineAndDepth_ const & nlad_)
 {
        os << string(nlad_.depth_, ' ');
        return os;
 }
 
+///
+std::string fmt(char const * fmtstr ...);
+
 #endif