TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems...

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

diff --git a/src/support/docstream.h b/src/support/docstream.h
index b4a4f80fb148c303f2945891d370246112bf3914..0a2d42b38bb418b0b6a02d3a7a55c507ff962f64 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -14,6 +14,13 @@
 
 #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>
 
@@ -68,9 +75,6 @@ public:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-extern template class std::numpunct<lyx::char_type>;
-#endif
 
 /// UCS4 input stringstream
 typedef std::basic_istringstream<char_type> idocstringstream;