Preparation for quickcpplib and outcome v2 port

55 files changed, 70 insertions, 39 deletions

diff --git a/.gitmodules b/.gitmodules
index 3e202bde..c8fbb46a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,14 +6,14 @@
 	ignore = none
 #	shallow = true
 [submodule "include/boost/afio/boost-lite"]
-	path = include/boost/afio/boost-lite
+	path = include/afio/boost-lite
 	url = https://github.com/ned14/boost-lite.git
 	branch = master
 	fetchRecurseSubmodules = true
 	ignore = untracked
 #	shallow = true
 [submodule "include/boost/afio/outcome"]
-	path = include/boost/afio/outcome
+	path = include/afio/outcome
 	url = https://github.com/ned14/boost.outcome.git
 	branch = master
 	fetchRecurseSubmodules = true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87b9f042..07de652c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,50 +1,38 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-# If necessary bring in the Boost lite cmake tooling
-list(FIND CMAKE_MODULE_PATH "boost-lite" boost_lite_idx)
-if(${boost_lite_idx} EQUAL -1)
-  if(EXISTS "${CMAKE_SOURCE_DIR}/../.use_boostish_siblings")
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../boost-lite/cmake")
-  elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.use_boostish_siblings")
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../boost-lite/cmake")
-  elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/boost-lite/cmake")
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/boost-lite/cmake")
-  else()
-    message(FATAL_ERROR "FATAL: A copy of boost-lite cannot be found. Try running 'git submodule update --init --recursive'")
-  endif()
-endif()
-include(BoostLiteRequireOutOfSourceBuild)
-include(BoostLiteUtils)
-include(BoostLitePolicies)
+include(cmake/QuickCppLibBootstrap.cmake)
+include(QuickCppLibRequireOutOfSourceBuild)
+include(QuickCppLibUtils)
+include(QuickCppLibPolicies)
 
 # Parse the version we tell cmake directly from the version header file
-ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/version.hpp" VERSIONSTRING)
+ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/afio/version.hpp" VERSIONSTRING)
 # Sets the usual PROJECT_NAME etc
 project(afio VERSION ${VERSIONSTRING} LANGUAGES C CXX)
 # Also set a *cmake* namespace for this project
-set(PROJECT_NAMESPACE boost::)
+set(PROJECT_NAMESPACE)
 # Setup this cmake environment for this project
-include(BoostLiteSetupProject)
+include(QuickCppLibSetupProject)
 if(NOT PROJECT_IS_DEPENDENCY)
   # This file should be updated with the last git SHA next commit
-  UpdateRevisionHppFromGit("${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/revision.hpp")
+  UpdateRevisionHppFromGit("${CMAKE_CURRENT_SOURCE_DIR}/include/afio/revision.hpp")
 endif()
 # Find my library dependencies
-find_boostish_library(boost-lite "include/boost/afio" 1.0 REQUIRED)
-find_boostish_library(outcome    "include/boost/afio" 1.0 REQUIRED)
-find_boostish_library(kerneltest "test"               1.0 REQUIRED)
+find_quickcpplib_library(quickcpplib 1.0 REQUIRED)
+find_quickcpplib_library(outcome 2.0 REQUIRED)
+find_quickcpplib_library(kerneltest 1.0 REQUIRED)
 
 # Make the standard static and shared libraries, and if supported by this compiler, C++ modules
 # for both static and shared libraries as well. For the non-C++ module variants, makes the
 # interface headers into precompiled headers. Only builds all of them if this is the topmost
 # CMakeLists, else built only if something upstream is dependent on one of them.
-include(BoostLiteMakeLibrary)
+include(QuickCppLibMakeLibrary)
 # Make an interface only library so dependent CMakeLists can bring in this header-only library
-include(BoostLiteMakeHeaderOnlyLibrary)
+include(QuickCppLibMakeHeaderOnlyLibrary)
 
 # Create a custom doxygen generation target
-include(BoostLiteMakeDoxygen)
+include(QuickCppLibMakeDoxygen)
 # Set the standard definitions for these libraries and bring in the all_* helper functions
-include(BoostLiteApplyDefaultDefinitions)
+include(QuickCppLibApplyDefaultDefinitions)
 # Set the C++ features this library requires
 all_compile_features(PUBLIC
   # cxx_exceptions                        ## Annoyingly not supported by cmake 3.6
@@ -62,7 +50,7 @@ if(NOT MSVC OR CMAKE_VERSION VERSION_GREATER 3.59)
   )
 endif()
 # Set the library dependencies this library has
-all_link_libraries(PUBLIC boost-lite::hl boost::outcome::hl boost::kerneltest::hl)
+all_link_libraries(PUBLIC quickcpplib::hl outcome::hl kerneltest::hl)
 # Set the system dependencies this library has
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   all_link_libraries(PUBLIC stdc++fs rt)
@@ -73,12 +61,12 @@ if(WIN32)
 endif()
 # Anyone using the static or dynamic libraries is not using the header only variant
 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) 
+  target_compile_definitions(${lib} INTERFACE AFIO_HEADERS_ONLY=0) 
+  target_compile_definitions(${lib} PRIVATE AFIO_SOURCE=1) 
 endforeach()
 
 # For all possible configurations of this library, add each test
-include(BoostLiteMakeStandardTests)
+include(QuickCppLibMakeStandardTests)
 # For each test target, set compile options
 if(MSVC)
   foreach(test_target ${afio_TEST_TARGETS})
@@ -86,6 +74,9 @@ if(MSVC)
   endforeach()
 endif()
 
+# Cache this library's auto scanned sources for later reuse
+include(QuickCppLibCacheLibrarySources)
+
 # Make available this library for install and export
-include(BoostLiteMakeInstall)
-include(BoostLiteMakeExport)
+include(QuickCppLibMakeInstall)
+include(QuickCppLibMakeExport)
diff --git a/cmake/QuickCppLibBootstrap.cmake b/cmake/QuickCppLibBootstrap.cmake
new file mode 100644
index 00000000..bf61c540
--- /dev/null
+++ b/cmake/QuickCppLibBootstrap.cmake
@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+# If necessary bring in the quickcpplib cmake tooling
+list(FIND CMAKE_MODULE_PATH "quickcpplib/cmakelib" quickcpplib_idx)
+if(${quickcpplib_idx} EQUAL -1)
+  # CMAKE_SOURCE_DIR is the very topmost parent cmake project
+  # CMAKE_CURRENT_SOURCE_DIR is the current cmake subproject
+  
+  # If there is a magic .quickcpplib_use_siblings directory above the topmost project, use sibling edition
+  if(EXISTS "${CMAKE_SOURCE_DIR}/../.quickcpplib_use_siblings")
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../quickcpplib/cmakelib")
+    set(CTEST_QUICKCPPLIB_SCRIPTS "${CMAKE_SOURCE_DIR}/../quickcpplib/scripts")
+  elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules")
+    # Read in .gitmodules and look for myself
+    file(READ "${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules" GITMODULESCONTENTS)
+    if(GITMODULESCONTENTS MATCHES ".*\\n?\\[submodule \"([^\"]+\\/quickcpplib)\"\\]")
+      set(quickcpplibpath "${CMAKE_MATCH_1}")
+      if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${quickcpplibpath}/cmake")
+        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/${quickcpplibpath}/cmakelib")
+        set(CTEST_QUICKCPPLIB_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/${quickcpplibpath}/scripts")
+      else()
+        message(WARNING "WARNING: ${quickcpplibpath}/cmake does not exist, attempting git submodule update --init --recursive ...")
+        include(FindGit)
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+          WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        )
+        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${quickcpplibpath}/cmake")
+          set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/${quickcpplibpath}/cmakelib")
+          set(CTEST_QUICKCPPLIB_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/${quickcpplibpath}/scripts")
+        else()
+          message(FATAL_ERROR "FATAL: ${quickcpplibpath}/cmake does not exist and git submodule update --init --recursive did not make it available, bailing out")
+        endif()
+      endif()
+    else()
+      message(FATAL_ERROR "FATAL: A copy of quickcpplib cannot be found, and cannot find a quickcpplib submodule in this git repository")
+    endif()
+  else()
+    message(FATAL_ERROR "FATAL: A copy of quickcpplib cannot be found, and there are no git submodules to search")
+  endif()
+endif()
+message(STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
diff --git a/include/boost/afio.hpp b/include/afio.hpp
index a74367f3..a74367f3 100644
--- a/include/boost/afio.hpp
+++ b/include/afio.hpp
diff --git a/include/boost/afio/afio.hpp b/include/afio/afio.hpp
index a42619a7..a42619a7 100644
--- a/include/boost/afio/afio.hpp
+++ b/include/afio/afio.hpp
diff --git a/include/boost/afio/afio.ixx b/include/afio/afio.ixx
index 06cf5b7e..06cf5b7e 100644
--- a/include/boost/afio/afio.ixx
+++ b/include/afio/afio.ixx
diff --git a/include/afio/boost-lite b/include/afio/boost-lite
new file mode 160000
+Subproject 17d79ade36a18ae9d8ebd241284c796a9336f47
diff --git a/include/afio/outcome b/include/afio/outcome
new file mode 160000
+Subproject 127812aee9d6cdbb53a2f889ea58c89d4fc4b4e
diff --git a/include/afio/revision.hpp b/include/afio/revision.hpp
new file mode 100644
index 00000000..8239c05d
--- /dev/null
+++ b/include/afio/revision.hpp
@@ -0,0 +1,4 @@
+// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
+#define BOOST_AFIO_PREVIOUS_COMMIT_REF    9993339dfac2bffaae5859f97fe6bf467bce864e
+#define BOOST_AFIO_PREVIOUS_COMMIT_DATE   "2017-05-09 17:11:30 +00:00"
+#define BOOST_AFIO_PREVIOUS_COMMIT_UNIQUE 9993339d
diff --git a/include/boost/afio/v1/afio.hpp b/include/afio/v1/afio.hpp
index 65e0c1da..65e0c1da 100644
--- a/include/boost/afio/v1/afio.hpp
+++ b/include/afio/v1/afio.hpp
diff --git a/include/boost/afio/v2.0/afio.hpp b/include/afio/v2.0/afio.hpp
index ec28f428..ec28f428 100644
--- a/include/boost/afio/v2.0/afio.hpp
+++ b/include/afio/v2.0/afio.hpp
diff --git a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/atomic_append.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/atomic_append.hpp
index bfd3116a..bfd3116a 100644
--- a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/atomic_append.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/atomic_append.hpp
diff --git a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp
index 0f652226..0f652226 100644
--- a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp
diff --git a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp
index ea38a986..ea38a986 100644
--- a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp
diff --git a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp
index 9b97c85b..9b97c85b 100644
--- a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp
diff --git a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp
index e78763cb..e78763cb 100644
--- a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp
diff --git a/include/boost/afio/v2.0/async_file_handle.hpp b/include/afio/v2.0/async_file_handle.hpp
index 611f8938..611f8938 100644
--- a/include/boost/afio/v2.0/async_file_handle.hpp
+++ b/include/afio/v2.0/async_file_handle.hpp
diff --git a/include/boost/afio/v2.0/config.hpp b/include/afio/v2.0/config.hpp
index cb21f7c4..cb21f7c4 100644
--- a/include/boost/afio/v2.0/config.hpp
+++ b/include/afio/v2.0/config.hpp
diff --git a/include/boost/afio/v2.0/deadline.h b/include/afio/v2.0/deadline.h
index bb33a5ec..bb33a5ec 100644
--- a/include/boost/afio/v2.0/deadline.h
+++ b/include/afio/v2.0/deadline.h
diff --git a/include/boost/afio/v2.0/detail/impl/posix/async_file_handle.ipp b/include/afio/v2.0/detail/impl/posix/async_file_handle.ipp
index 8aae7f27..8aae7f27 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/async_file_handle.ipp
+++ b/include/afio/v2.0/detail/impl/posix/async_file_handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/file_handle.ipp b/include/afio/v2.0/detail/impl/posix/file_handle.ipp
index 03ba1b92..03ba1b92 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/file_handle.ipp
+++ b/include/afio/v2.0/detail/impl/posix/file_handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/handle.ipp b/include/afio/v2.0/detail/impl/posix/handle.ipp
index c7c3d6ac..c7c3d6ac 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/handle.ipp
+++ b/include/afio/v2.0/detail/impl/posix/handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/io_service.ipp b/include/afio/v2.0/detail/impl/posix/io_service.ipp
index cf84abe2..cf84abe2 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/io_service.ipp
+++ b/include/afio/v2.0/detail/impl/posix/io_service.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/map_handle.ipp b/include/afio/v2.0/detail/impl/posix/map_handle.ipp
index fa73320f..fa73320f 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/map_handle.ipp
+++ b/include/afio/v2.0/detail/impl/posix/map_handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/stat.ipp b/include/afio/v2.0/detail/impl/posix/stat.ipp
index 3a7c30d9..3a7c30d9 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/stat.ipp
+++ b/include/afio/v2.0/detail/impl/posix/stat.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/statfs.ipp b/include/afio/v2.0/detail/impl/posix/statfs.ipp
index d1317264..d1317264 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/statfs.ipp
+++ b/include/afio/v2.0/detail/impl/posix/statfs.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/storage_profile.ipp b/include/afio/v2.0/detail/impl/posix/storage_profile.ipp
index ca5f64e2..ca5f64e2 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/storage_profile.ipp
+++ b/include/afio/v2.0/detail/impl/posix/storage_profile.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/posix/utils.ipp b/include/afio/v2.0/detail/impl/posix/utils.ipp
index 7f9afac6..7f9afac6 100644
--- a/include/boost/afio/v2.0/detail/impl/posix/utils.ipp
+++ b/include/afio/v2.0/detail/impl/posix/utils.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/storage_profile.ipp b/include/afio/v2.0/detail/impl/storage_profile.ipp
index 86cb4d88..86cb4d88 100644
--- a/include/boost/afio/v2.0/detail/impl/storage_profile.ipp
+++ b/include/afio/v2.0/detail/impl/storage_profile.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/async_file_handle.ipp b/include/afio/v2.0/detail/impl/windows/async_file_handle.ipp
index f1445d1c..f1445d1c 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/async_file_handle.ipp
+++ b/include/afio/v2.0/detail/impl/windows/async_file_handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/file_handle.ipp b/include/afio/v2.0/detail/impl/windows/file_handle.ipp
index 24302ed8..24302ed8 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/file_handle.ipp
+++ b/include/afio/v2.0/detail/impl/windows/file_handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/handle.ipp b/include/afio/v2.0/detail/impl/windows/handle.ipp
index cd50c428..cd50c428 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/handle.ipp
+++ b/include/afio/v2.0/detail/impl/windows/handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/import.hpp b/include/afio/v2.0/detail/impl/windows/import.hpp
index 4fd27f41..4fd27f41 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/import.hpp
+++ b/include/afio/v2.0/detail/impl/windows/import.hpp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/io_service.ipp b/include/afio/v2.0/detail/impl/windows/io_service.ipp
index 6ec5c52d..6ec5c52d 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/io_service.ipp
+++ b/include/afio/v2.0/detail/impl/windows/io_service.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/map_handle.ipp b/include/afio/v2.0/detail/impl/windows/map_handle.ipp
index 9c1400d1..9c1400d1 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/map_handle.ipp
+++ b/include/afio/v2.0/detail/impl/windows/map_handle.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/stat.ipp b/include/afio/v2.0/detail/impl/windows/stat.ipp
index e4082ef1..e4082ef1 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/stat.ipp
+++ b/include/afio/v2.0/detail/impl/windows/stat.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/statfs.ipp b/include/afio/v2.0/detail/impl/windows/statfs.ipp
index 0295afcc..0295afcc 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/statfs.ipp
+++ b/include/afio/v2.0/detail/impl/windows/statfs.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/storage_profile.ipp b/include/afio/v2.0/detail/impl/windows/storage_profile.ipp
index dec0ba19..dec0ba19 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/storage_profile.ipp
+++ b/include/afio/v2.0/detail/impl/windows/storage_profile.ipp
diff --git a/include/boost/afio/v2.0/detail/impl/windows/utils.ipp b/include/afio/v2.0/detail/impl/windows/utils.ipp
index ad597b5b..ad597b5b 100644
--- a/include/boost/afio/v2.0/detail/impl/windows/utils.ipp
+++ b/include/afio/v2.0/detail/impl/windows/utils.ipp
diff --git a/include/boost/afio/v2.0/file_handle.hpp b/include/afio/v2.0/file_handle.hpp
index e22717ee..e22717ee 100644
--- a/include/boost/afio/v2.0/file_handle.hpp
+++ b/include/afio/v2.0/file_handle.hpp
diff --git a/include/boost/afio/v2.0/handle.hpp b/include/afio/v2.0/handle.hpp
index a225c777..a225c777 100644
--- a/include/boost/afio/v2.0/handle.hpp
+++ b/include/afio/v2.0/handle.hpp
diff --git a/include/boost/afio/v2.0/hash.hpp b/include/afio/v2.0/hash.hpp
index 6bc38c5a..6bc38c5a 100644
--- a/include/boost/afio/v2.0/hash.hpp
+++ b/include/afio/v2.0/hash.hpp
diff --git a/include/boost/afio/v2.0/io_service.hpp b/include/afio/v2.0/io_service.hpp
index c0ab41fa..c0ab41fa 100644
--- a/include/boost/afio/v2.0/io_service.hpp
+++ b/include/afio/v2.0/io_service.hpp
diff --git a/include/boost/afio/v2.0/map_handle.hpp b/include/afio/v2.0/map_handle.hpp
index 89f9b361..89f9b361 100644
--- a/include/boost/afio/v2.0/map_handle.hpp
+++ b/include/afio/v2.0/map_handle.hpp
diff --git a/include/boost/afio/v2.0/native_handle_type.hpp b/include/afio/v2.0/native_handle_type.hpp
index bbb1b2b0..bbb1b2b0 100644
--- a/include/boost/afio/v2.0/native_handle_type.hpp
+++ b/include/afio/v2.0/native_handle_type.hpp
diff --git a/include/boost/afio/v2.0/small_prng.hpp b/include/afio/v2.0/small_prng.hpp
index d0a4660f..d0a4660f 100644
--- a/include/boost/afio/v2.0/small_prng.hpp
+++ b/include/afio/v2.0/small_prng.hpp
diff --git a/include/boost/afio/v2.0/spinlock.hpp b/include/afio/v2.0/spinlock.hpp
index 5b9231a1..5b9231a1 100644
--- a/include/boost/afio/v2.0/spinlock.hpp
+++ b/include/afio/v2.0/spinlock.hpp
diff --git a/include/boost/afio/v2.0/stat.hpp b/include/afio/v2.0/stat.hpp
index e20022f6..e20022f6 100644
--- a/include/boost/afio/v2.0/stat.hpp
+++ b/include/afio/v2.0/stat.hpp
diff --git a/include/boost/afio/v2.0/statfs.hpp b/include/afio/v2.0/statfs.hpp
index 31e368b4..31e368b4 100644
--- a/include/boost/afio/v2.0/statfs.hpp
+++ b/include/afio/v2.0/statfs.hpp
diff --git a/include/boost/afio/v2.0/storage_profile.hpp b/include/afio/v2.0/storage_profile.hpp
index a2b3d071..a2b3d071 100644
--- a/include/boost/afio/v2.0/storage_profile.hpp
+++ b/include/afio/v2.0/storage_profile.hpp
diff --git a/include/boost/afio/v2.0/utils.hpp b/include/afio/v2.0/utils.hpp
index 9b3e7ea8..9b3e7ea8 100644
--- a/include/boost/afio/v2.0/utils.hpp
+++ b/include/afio/v2.0/utils.hpp
diff --git a/include/boost/afio/version.hpp b/include/afio/version.hpp
index bda8cd0b..bda8cd0b 100644
--- a/include/boost/afio/version.hpp
+++ b/include/afio/version.hpp
diff --git a/include/boost/afio/boost-lite b/include/boost/afio/boost-lite
deleted file mode 160000
-Subproject ed8678b7b2c17f1064301e3f713a6593fe91f7f
diff --git a/include/boost/afio/outcome b/include/boost/afio/outcome
deleted file mode 160000
-Subproject 1f15abd5107bf9218253db1f9a18d97226dd693
diff --git a/include/boost/afio/revision.hpp b/include/boost/afio/revision.hpp
deleted file mode 100644
index d5cf1614..00000000
--- a/include/boost/afio/revision.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define BOOST_AFIO_PREVIOUS_COMMIT_REF    607b5747e7204926edfdd26f7924a4cab8916050
-#define BOOST_AFIO_PREVIOUS_COMMIT_DATE   "2017-04-28 13:31:23 +00:00"
-#define BOOST_AFIO_PREVIOUS_COMMIT_UNIQUE 607b5747