anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvc: Proper fix for compilation of TexRow

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

Thanks Vincent and Georg.
This commit is contained in:
Guillaume Munch 2015-10-20 19:18:28 +02:00 committed by Vincent van Ravesteijn
parent 990446c0e1
commit 7a60c96dfa
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/docstream.h
View File

@ -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>

9
src/support/strfwd.h
View File

@ -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 {
/**