Should now be fully working with new quickcpplib discovery mechanism

12 files changed, 15 insertions, 19 deletions

diff --git a/cmake/headers.cmake b/cmake/headers.cmake
index a309e857..7afd60c1 100644
--- a/cmake/headers.cmake
+++ b/cmake/headers.cmake
@@ -6,7 +6,6 @@ set(afio_HEADERS
   "include/afio/ntkernel-error-category/include/config.hpp"
   "include/afio/ntkernel-error-category/include/ntkernel_category.hpp"
   "include/afio/revision.hpp"
-  "include/afio/v1/afio.hpp"
   "include/afio/v2.0/afio.hpp"
   "include/afio/v2.0/algorithm/shared_fs_mutex/atomic_append.hpp"
   "include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp"
@@ -21,15 +20,12 @@ set(afio_HEADERS
   "include/afio/v2.0/file_handle.hpp"
   "include/afio/v2.0/fs_handle.hpp"
   "include/afio/v2.0/handle.hpp"
-  "include/afio/v2.0/hash.hpp"
   "include/afio/v2.0/io_handle.hpp"
   "include/afio/v2.0/io_service.hpp"
   "include/afio/v2.0/map_handle.hpp"
   "include/afio/v2.0/native_handle_type.hpp"
   "include/afio/v2.0/path_handle.hpp"
   "include/afio/v2.0/path_view.hpp"
-  "include/afio/v2.0/small_prng.hpp"
-  "include/afio/v2.0/spinlock.hpp"
   "include/afio/v2.0/stat.hpp"
   "include/afio/v2.0/statfs.hpp"
   "include/afio/v2.0/storage_profile.hpp"
diff --git a/doc/html b/doc/html
-Subproject bcf85068d01422afce67b6dcbab14559529d34a
+Subproject 68a28b7a3426d8b43b745a30c2b781809432d80
diff --git a/include/afio/revision.hpp b/include/afio/revision.hpp
index 0102b5d4..46933f32 100644
--- a/include/afio/revision.hpp
+++ b/include/afio/revision.hpp
@@ -1,4 +1,4 @@
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define AFIO_PREVIOUS_COMMIT_REF    653b2c15427a42642e8cd4d19119b7dc296d9262
-#define AFIO_PREVIOUS_COMMIT_DATE   "2017-08-16 15:39:01 +00:00"
-#define AFIO_PREVIOUS_COMMIT_UNIQUE 653b2c15
+#define AFIO_PREVIOUS_COMMIT_REF    0c8f416d674e27ab2edfe1f1d045d4646abf7d78
+#define AFIO_PREVIOUS_COMMIT_DATE   "2017-08-16 22:08:53 +00:00"
+#define AFIO_PREVIOUS_COMMIT_UNIQUE 0c8f416d
diff --git a/include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp
index b92977be..a5889ff2 100644
--- a/include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/base.hpp
@@ -27,7 +27,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include "../../handle.hpp"
 
-#include "../../hash.hpp"
+#include "../../quickcpplib/include/algorithm/hash.hpp"
 
 //! \file base.hpp Provides algorithm::shared_fs_mutex::shared_fs_mutex
 
diff --git a/include/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp
index aa834e5a..477adbcf 100644
--- a/include/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/byte_ranges.hpp
@@ -28,7 +28,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include "../../file_handle.hpp"
 #include "base.hpp"
 
-#include "../../small_prng.hpp"
+#include "../../quickcpplib/include/algorithm/small_prng.hpp"
 
 //! \file byte_ranges.hpp Provides algorithm::shared_fs_mutex::byte_ranges
 
diff --git a/include/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp
index 68dfbcc0..713510a3 100644
--- a/include/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/lock_files.hpp
@@ -28,7 +28,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include "../../file_handle.hpp"
 #include "base.hpp"
 
-#include "../../small_prng.hpp"
+#include "../../quickcpplib/include/algorithm/small_prng.hpp"
 
 //! \file lock_files.hpp Provides algorithm::shared_fs_mutex::lock_files
 
diff --git a/include/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp b/include/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp
index cca2b2a0..13ea1ab0 100644
--- a/include/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp
+++ b/include/afio/v2.0/algorithm/shared_fs_mutex/memory_map.hpp
@@ -28,9 +28,9 @@ Distributed under the Boost Software License, Version 1.0.
 #include "../../map_handle.hpp"
 #include "base.hpp"
 
-#include "../../hash.hpp"
-#include "../../small_prng.hpp"
-#include "../../spinlock.hpp"
+#include "../../quickcpplib/include/algorithm/hash.hpp"
+#include "../../quickcpplib/include/algorithm/small_prng.hpp"
+#include "../../quickcpplib/include/spinlock.hpp"
 
 //! \file memory_map.hpp Provides algorithm::shared_fs_mutex::memory_map
 
diff --git a/include/afio/v2.0/detail/impl/posix/utils.ipp b/include/afio/v2.0/detail/impl/posix/utils.ipp
index 4883e06a..925f1d32 100644
--- a/include/afio/v2.0/detail/impl/posix/utils.ipp
+++ b/include/afio/v2.0/detail/impl/posix/utils.ipp
@@ -24,7 +24,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include "../../../utils.hpp"
 
-#include "../../../spinlock.hpp"
+#include "../../../quickcpplib/include/spinlock.hpp"
 
 #include <mutex>  // for lock_guard
 
diff --git a/include/afio/v2.0/detail/impl/windows/utils.ipp b/include/afio/v2.0/detail/impl/windows/utils.ipp
index 414c1979..2479e590 100644
--- a/include/afio/v2.0/detail/impl/windows/utils.ipp
+++ b/include/afio/v2.0/detail/impl/windows/utils.ipp
@@ -24,7 +24,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include "../../../utils.hpp"
 
-#include "../../../spinlock.hpp"
+#include "../../../quickcpplib/include/spinlock.hpp"
 #include "import.hpp"
 
 AFIO_V2_NAMESPACE_BEGIN
diff --git a/include/afio/v2.0/outcome b/include/afio/v2.0/outcome
-Subproject d5af8b23e07c1140d97de8017d50ba97174a4e6
+Subproject 3080f558b6eb7f20dd0163bc8cf3d00397353c7
diff --git a/include/afio/v2.0/quickcpplib b/include/afio/v2.0/quickcpplib
-Subproject a24674dfcb914b649bbbfe1981ffb155fc915ef
+Subproject c3eb6e4b3e8d67d640dae984833168cc39e4912
diff --git a/test/kerneltest b/test/kerneltest
-Subproject dd7baf384f80f8ae523b96ba6505ec254dd34a0
+Subproject 3067e3b39364f2f9fbfe54ec5558f2e4527c8e3