From 7a60c96dfa151d5c3bf4510c1889297de95b3c07 Mon Sep 17 00:00:00 2001 From: Guillaume Munch Date: Tue, 20 Oct 2015 19:18:28 +0200 Subject: [PATCH] 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. --- src/support/docstream.h | 7 ------- src/support/strfwd.h | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/support/docstream.h b/src/support/docstream.h index 52916b0223..108d00e0f6 100644 --- 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 #include diff --git a/src/support/strfwd.h b/src/support/strfwd.h index 8419b51351..30e1c092f0 100644 --- a/src/support/strfwd.h +++ b/src/support/strfwd.h @@ -61,6 +61,15 @@ typedef basic_ostringstream, allocator > 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 { /** -- 2.39.5