Simplify and fix PP logic.

[SVN r53729]
2009-06-07 17:50:17 +00:00
parent 5a80ab5ed4
commit 02a629baf7
1 changed files with 3 additions and 5 deletions
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@ -164,11 +164,9 @@
 #     pragma warning(push)
 #     pragma warning(disable : 4251 4231 4660)
 #  endif
-#  ifdef _DLL
-#     if BOOST_WORKAROUND(BOOST_MSVC, <1600)
-#        include <string>
-         extern template class __declspec(dllimport) std::basic_string<unsigned short>;
-#     endif
+#  if defined(_DLL) && defined(BOOST_MSVC) && (BOOST_MSVC < 1600)
+#     include <string>
+      extern template class __declspec(dllimport) std::basic_string<unsigned short>;
 #  endif
 #  ifdef BOOST_MSVC
 #     pragma warning(pop)