Fixed up the boost-lite C++ Modules build support which had become stale, and Gaby wanted a repro for the ICE we see when turning on C++ Modules.

9 files changed, 11 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd2b3076..0efc3e7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,15 +71,6 @@ foreach(lib afio_sl afio_dl)
   target_compile_definitions(${lib} INTERFACE BOOST_AFIO_HEADERS_ONLY=0) 
   target_compile_definitions(${lib} PRIVATE BOOST_AFIO_SOURCE=1) 
 endforeach()
-# Test C++ Modules (ICEs in VS2015 Update 3)
-if(MSVC AND 0)
-  target_compile_definitions(afio_dl PUBLIC -D__cpp_modules=1)
-  target_compile_options(afio_dl PUBLIC /experimental:module)
-  target_sources(afio_dl PRIVATE include/boost/afio/afio.ixx)
-  set_source_files_properties(include/boost/afio/afio.ixx PROPERTIES
-      LANGUAGE CXX
-  )
-endif()
 
 # For all possible configurations of this library, add each test
 include(BoostLiteMakeStandardTests)
diff --git a/doc/html b/doc/html
-Subproject 7af6c4e0826b26e84ed10a61fc96a59841c95f0
+Subproject 3d9b5d3c729b325f56fcc099332483d61b90db1
diff --git a/graphs/benchmark_locking 2x i5 M540 @ 2.53Ghz Win10 4.125Gb bandwidth.xlsx b/graphs/benchmark_locking 2x i5 M540 @ 2.53Ghz Win10 4.125Gb bandwidth.xlsx
index d466fa3a..3c9a454a 100644
--- a/graphs/benchmark_locking 2x i5 M540 @ 2.53Ghz Win10 4.125Gb bandwidth.xlsx
+++ b/graphs/benchmark_locking 2x i5 M540 @ 2.53Ghz Win10 4.125Gb bandwidth.xlsx
diff --git a/include/boost/afio/afio.ixx b/include/boost/afio/afio.ixx
index 4d0e2b02..06cf5b7e 100644
--- a/include/boost/afio/afio.ixx
+++ b/include/boost/afio/afio.ixx
@@ -1,4 +1,4 @@
 // Tell the headers we are generating the interface for the library
-#define GENERATING_CXX_MODULE_INTERFACE
+#define GENERATING_AFIO_MODULE_INTERFACE
 module afio_v2_0;  // BOOST_AFIO_MODULE_NAME
 #include "afio.hpp"
diff --git a/include/boost/afio/boost-lite b/include/boost/afio/boost-lite
-Subproject 6499f533a0ba574d17edb3822d50bce131e0b1b
+Subproject 6a987e6582323414a9a18c04fef3cba293f3328
diff --git a/include/boost/afio/outcome b/include/boost/afio/outcome
-Subproject e89ef89a0a4f53e70e172c694dd385e7122989a
+Subproject 33b8449a8d847bc1bb4c60364201a32f9529756
diff --git a/include/boost/afio/v2.0/afio.hpp b/include/boost/afio/v2.0/afio.hpp
index 5a2fa796..ec28f428 100644
--- a/include/boost/afio/v2.0/afio.hpp
+++ b/include/boost/afio/v2.0/afio.hpp
@@ -35,7 +35,7 @@
 // If C++ Modules are on and we are not compiling the library,
 // we are either generating the interface or importing
 #if defined(__cpp_modules)
-#if defined(GENERATING_CXX_MODULE_INTERFACE)
+#if defined(GENERATING_AFIO_MODULE_INTERFACE)
 // We are generating this module's interface
 #define BOOSTLITE_HEADERS_ONLY 0
 #define BOOST_AFIO_HEADERS_ONLY 0
diff --git a/include/boost/afio/v2.0/config.hpp b/include/boost/afio/v2.0/config.hpp
index b4161cc9..e439a27d 100644
--- a/include/boost/afio/v2.0/config.hpp
+++ b/include/boost/afio/v2.0/config.hpp
@@ -169,7 +169,9 @@ DEALINGS IN THE SOFTWARE.
 // Default to the C++ 11 STL if on VS2015 or has <experimental/filesystem>
 #ifndef BOOST_AFIO_USE_BOOST_FILESYSTEM
 #ifdef __has_include
-#if __has_include(<filesystem>) || __has_include(<experimental / filesystem>)
+// clang-format off
+#if __has_include(<filesystem>) || __has_include(<experimental/filesystem>)
+// clang-format on
 #define BOOST_AFIO_USE_BOOST_FILESYSTEM 0
 #endif
 #endif
@@ -259,11 +261,11 @@ exported AFIO v2 namespace.
   }                                                                                                                                                                                                                                                                                                                            \
   }                                                                                                                                                                                                                                                                                                                            \
   }
-#elif defined(GENERATING_CXX_MODULE_INTERFACE)
+#elif defined(GENERATING_AFIO_MODULE_INTERFACE)
 #define BOOST_AFIO_V2_NAMESPACE BOOSTLITE_BIND_NAMESPACE(BOOST_AFIO_V2)
 #define BOOST_AFIO_V2_NAMESPACE_BEGIN BOOSTLITE_BIND_NAMESPACE_BEGIN(BOOST_AFIO_V2)
 #define BOOST_AFIO_V2_NAMESPACE_EXPORT_BEGIN BOOSTLITE_BIND_NAMESPACE_EXPORT_BEGIN(BOOST_AFIO_V2)
-#define BOOST_AFIO_V2_NAMESPACE_END BOOSTLITE_NAMESPACE_BIND_END(BOOST_AFIO_V2)
+#define BOOST_AFIO_V2_NAMESPACE_END BOOSTLITE_BIND_NAMESPACE_END(BOOST_AFIO_V2)
 #else
 #define BOOST_AFIO_V2_NAMESPACE BOOSTLITE_BIND_NAMESPACE(BOOST_AFIO_V2)
 #define BOOST_AFIO_V2_NAMESPACE_BEGIN BOOSTLITE_BIND_NAMESPACE_BEGIN(BOOST_AFIO_V2)
diff --git a/test/kerneltest b/test/kerneltest
-Subproject e6fc9137932e7ed5230d074063196c52327659b
+Subproject 6c02d239188bdf1d700ab7efa7d591fe5de6e00