Merge branch 'develop' into modules

Fixed Conflicts:
	include/boost/regex/config.hpp

Also fix up msvc build failures.
Example now build with msvc or with clang.  The build script is still hopelessly broken though.

include/boost/regex/config.hpp

@@ -34,6 +34,7 @@
 #define BOOST_REGEX_STATIC_CONST static const
 #else
 #define BOOST_REGEX_STATIC_CONST inline constexpr
+#define BOOST_REGEX_STANDALONE
 #endif
 
 /*
@@ -43,6 +44,7 @@
 #if defined(__BORLANDC__) && !defined(__clang__)
 #  include <boost/regex/config/borland.hpp>
 #endif
+
 #ifndef BOOST_REGEX_STANDALONE
 #include <boost/version.hpp>
 #endif

module/regex.cxx

@@ -2,12 +2,11 @@
 module;
 
 #if defined(_WIN32) && __has_include(<windows.h>)
+//
+// This has to appear *before* import std; otherwise the compiler chokes.
+//
 #include <windows.h>
 #endif
-#include <cctype>
-#include <cstddef>
-#include <cwctype>
-#include <cassert>
 
 #ifdef __cpp_lib_modules
 import std;
@@ -50,6 +49,8 @@ import std.core;
 #endif
 #endif
 
+#include <cwctype>
+#include <assert.h>
 
 #if __has_include(<unicode/utypes.h>)
 #include <unicode/utypes.h>

test/module/regex_token_iterator_eg_2.cpp

@@ -17,6 +17,8 @@
   */
 
 
+import boost.regex;
+
 #ifdef __cpp_lib_modules
 import std;
 #elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
@@ -27,8 +29,6 @@ import std.core;
 #include <iterator>
 #endif
 
-import boost.regex;
-
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
                boost::regex::normal | boost::regex::icase);