From 02a629baf74f25389adf3ff3f507c4597bf881ed Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sun, 7 Jun 2009 17:50:17 +0000
Subject: [PATCH] Simplify and fix PP logic.

[SVN r53729]
---
 include/boost/regex/config.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index 88f234d1..8306f3ff 100644
--- 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)