[Boost-commit] svn:boost r53729 - trunk/boost/regex

Subject: [Boost-commit] svn:boost r53729 - trunk/boost/regex
From: john_at_[hidden]
Date: 2009-06-07 13:50:17

Author: johnmaddock
Date: 2009-06-07 13:50:17 EDT (Sun, 07 Jun 2009)
New Revision: 53729
URL: http://svn.boost.org/trac/boost/changeset/53729

Log:
Simplify and fix PP logic.
Text files modified: 
   trunk/boost/regex/config.hpp |     8 +++-----                                
   1 files changed, 3 insertions(+), 5 deletions(-)

Modified: trunk/boost/regex/config.hpp
==============================================================================
--- trunk/boost/regex/config.hpp	(original)
+++ trunk/boost/regex/config.hpp	2009-06-07 13:50:17 EDT (Sun, 07 Jun 2009)
@@ -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)