B2 5.2.1

appveyor.yml

@@ -10,6 +10,7 @@ branches:
     - /release/
     - /feature\/.*/
     - /backport-.*/
+    - /version\/.*/
 
 skip_commits:
   files:

doc/src/history.adoc

@@ -1,6 +1,20 @@
 [[b2.history]]
 = History
 
+== Version 5.2.1
+
+This patch reverts the change to define `_HAS_EXCEPTIONS=0` for Dinkumware
+std library. It has the undesired effect of changing the ABI. It's better for
+user code to handle the conbination of turning off exceptions while treating
+warnings as errors, and getting warnings/errors from the std library by having
+the users silence the warning themselves.
+
+This patch also fixes the case of asking to initialize any msvc toolset
+versions (`using msvc ;`) when there are already versions initialized. Instead
+of erroring to say that a version is already in use, it considers the set
+of already initialized msvc toolsets as satisfying the request to generally
+initialize msvc.
+
 == Version 5.2.0
 
 Many fixes in this release from regular contributors Nikita and Dmitry. There

src/build/version.jam

@@ -10,7 +10,7 @@ import numbers ;
 # Mirror engine JAM_VERSION
 .major = 5 ;
 .minor = 2 ;
-.patch = 0 ;
+.patch = 1 ;
 
 
 rule build ( )

src/engine/patchlevel.h

@@ -14,4 +14,4 @@ Distributed under the Boost Software License, Version 1.0.
 
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 2
-#define VERSION_PATCH 0
+#define VERSION_PATCH 1

src/tools/msvc.jam

@@ -1272,6 +1272,13 @@ local rule configure-really ( version ? : options * )
 {
     local command = [ feature.get-values <command> : $(options) ] ;
 
+    # We don't try and register any more versions than what we already know
+    # about when ask to discover any available versions.
+    if ! $(version) && ! $(command) && [ $(.versions).used ]
+    {
+        return ;
+    }
+
     if ! $(version) && ! $(command)
     {
         # We were given neither a command, nor a version.
@@ -1965,7 +1972,6 @@ local rule register-toolset-really ( )
     toolset.flags msvc.compile C++FLAGS  <exception-handling>on/<asynch-exceptions>off/<extern-c-nothrow>on : /EHsc ;
     toolset.flags msvc.compile C++FLAGS  <exception-handling>on/<asynch-exceptions>on/<extern-c-nothrow>off : /EHa ;
     toolset.flags msvc.compile C++FLAGS  <exception-handling>on/<asynch-exceptions>on/<extern-c-nothrow>on : /EHac ;
-    toolset.flags msvc.compile C++FLAGS  <exception-handling>off : -D_HAS_EXCEPTIONS=0 ;
 
     toolset.flags msvc.compile C++FLAGS  <cxxstd>14 : "/std:c++14" ;
     toolset.flags msvc.compile C++FLAGS  <cxxstd>17 : "/std:c++17" ;

test/test_all.py

@@ -298,7 +298,6 @@ def reorder_tests(tests, first_test):
          "expansion",
          "explicit",
          "feature_cxxflags",
-         "feature_exception",
          "feature_implicit_dependency",
          "feature_relevant",
          "feature_suppress_import_lib",