CMake: fix merged build, seems GCC could not handle the namespaces correctly

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

diff --git a/src/support/docstream.h b/src/support/docstream.h
index 50fb82b7bc3974087acf19084db542036f8e6f56..056205df1972a6170214df2e85ab8dda28dede60 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -42,27 +42,26 @@ typedef std::basic_ostream<char_type> odocstream;
 
 /// File stream for reading UTF8-encoded files with automatic conversion to
 /// UCS4.
-class idocfstream : public std::basic_ifstream<char_type> {
+class ifdocstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
-       idocfstream(std::string const & encoding = "UTF-8");
-       explicit idocfstream(const char* s,
+       ifdocstream();
+       explicit ifdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::in,
                std::string const & encoding = "UTF-8");
-       ~idocfstream() {}
+       ~ifdocstream() {}
 };
 
 /// File stream for writing files in 8bit encoding \p encoding with automatic
 /// conversion from UCS4.
-class odocfstream : public std::basic_ofstream<char_type> {
+class ofdocstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
-       odocfstream();
-       odocfstream(std::string const & encoding);
-       explicit odocfstream(const char* s,
+       ofdocstream();
+       explicit ofdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
                std::string const & encoding = "UTF-8");
-       ~odocfstream() {}
+       ~ofdocstream() {}
        ///
        void reset(std::string const & encoding);
 };
@@ -91,6 +90,7 @@ SetEnc setEncoding(std::string const & encoding);
     \endcode
  */
 odocstream & operator<<(odocstream & os, SetEnc e);
+idocstream & operator<<(idocstream & os, SetEnc e);
 
 }