msvc: Proper fix for compilation of TexRow

This bug in MSVC 10 was fixed at e948caf6, but the workaround belongs to
strfwd.h.

Thanks Vincent and Georg.

diff --git a/src/support/docstream.h b/src/support/docstream.h
index 52916b02239fcab9daffed0486c1cfe0b26f5eab..108d00e0f63d243a24a329d601d792f708bb1523 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>
 

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index 8419b513519b2d2d017247686fbac6169478d428..30e1c092f07675fe9104586c5adb09cacd0f1658 100644 (file)
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -61,6 +61,15 @@ typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringst
 
 #endif
 
+
+// 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.
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) 
+#include "support/numpunct_lyx_char_type.h"
+#endif
+
+
 namespace lyx {
 
 /**