FORMAT for format 594

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

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index 30e1c092f07675fe9104586c5adb09cacd0f1658..eef3a83a0ce44a04eeb42ff55e0e57f45a8415ff 100644 (file)
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -23,8 +23,14 @@ namespace lyx { typedef wchar_t char_type; }
 
 #else
 
-#include <boost/cstdint.hpp>
-namespace lyx { typedef boost::uint32_t char_type; }
+#include <cstdint>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+namespace lyx { typedef uint32_t char_type; }
+#include "support/numpunct_lyx_char_type.h" // implementation for our char_type needed
+#else
+namespace lyx { typedef std::uint32_t char_type; }
+#endif
 
 #endif
 
@@ -57,17 +63,12 @@ typedef basic_istream<char, char_traits<char> > istream;
 typedef basic_ostream<char, char_traits<char> > ostream;
 typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringstream;
 
-} // namepace std
+} // namespace std
 
 #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 {