Merge from trunk

[SVN r39533]

include/boost/regex/v4/match_flags.hpp

@@ -23,8 +23,6 @@
 #  include <boost/cstdint.hpp>
 #endif
 
-#include <boost/detail/workaround.hpp>
-
 #ifdef __cplusplus
 namespace boost{
    namespace regex_constants{
@@ -73,7 +71,7 @@ typedef enum _match_flags
 
 } match_flags;
 
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(__BORLANDC__)
 typedef unsigned long match_flag_type;
 #else
 typedef match_flags match_flag_type;