Sync from upstream.

Author: grafikrobot

include/boost/serialization/variant.hpp

@@ -44,13 +44,11 @@
 // Boost Variant2 supports all C++ versions back to C++11
 #if BOOST_CXX_VERSION >= 201103L
 #include <boost/variant2/variant.hpp>
-#include <type_traits>
 #endif
 
-// Boost Variant2 supports all C++ versions back to C++11
+// std::variant supports all C++ versions back to C++11
 #ifndef BOOST_NO_CXX17_HDR_VARIANT
 #include <variant>
-//#include <type_traits>
 #endif
 
 #include <boost/archive/archive_exception.hpp>

include/boost/serialization/variant2.hpp

@@ -17,7 +17,7 @@
 //
 // See http://www.boost.org for updates, documentation, and revision history.
 //
-// Widely inspired form boost::variant serialization
+// Widely inspired from boost::variant serialization
 //
 
 #include <boost/serialization/throw_exception.hpp>

performance/profile.sh

@@ -15,8 +15,8 @@ then
     echo "  threading=single,multi"
     echo "  -sBOOST_ARCHIVE_LIST=<archive name>"
 else
-    bjam --dump-tests variant=profile preserve-test-targets=on $@ >bjam.log 2>&1
-    process_jam_log --v2 <bjam.log
+    b2 --dump-tests variant=profile preserve-test-targets=on $@ >b2.log 2>&1
+    process_jam_log --v2 <b2ls.log
 
     # for each test directory