Fix bug 9798.

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

diff --git a/src/support/docstream.h b/src/support/docstream.h
index 52916b02239fcab9daffed0486c1cfe0b26f5eab..409c7557a85cbdd8a854f80f127a2f6c58dd0bee 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -14,13 +14,6 @@
 
 #include "support/docstring.h"
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) 
-// Ugly workaround for MSVC10 STL bug:
-// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 32 bit 
-// so we can't import it and must define it but then the compiler complains.
-#include "support/numpunct_lyx_char_type.h"
-#endif
-
 #include <fstream>
 #include <sstream>
 
@@ -47,12 +40,19 @@ typedef std::basic_istream<char_type> idocstream;
  */
 typedef std::basic_ostream<char_type> odocstream;
 
+struct SetEnc;
+
 /// File stream for reading UTF8-encoded files with automatic conversion to
 /// UCS4.
+/// Buffering must be switched off if the encoding is changed after
+/// construction by calling rdbuf()->pubsetbuf(0, 0).
 class ifdocstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
        ifdocstream();
+       /// Create a stream with a specific encoding \p enc.
+       /// We must not pass \p enc as string, to avoid confusing it with a file name.
+       explicit ifdocstream(SetEnc const & enc);
        explicit ifdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::in,
                std::string const & encoding = "UTF-8");
@@ -66,6 +66,9 @@ class ofdocstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
        ofdocstream();
+       /// Create a stream with a specific encoding \p enc.
+       /// We must not pass \p enc as string, to avoid confusing it with a file name.
+       explicit ofdocstream(SetEnc const & enc);
        explicit ofdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
                std::string const & encoding = "UTF-8");
@@ -111,6 +114,6 @@ SetEnc setEncoding(std::string const & encoding);
 odocstream & operator<<(odocstream & os, SetEnc e);
 idocstream & operator<<(idocstream & os, SetEnc e);
 
-}
+} // namespace lyx
 
 #endif