Lots of minor fixes realised during the part way through merge of AFIO tooling improvements into Outcome

6 files changed, 14 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1a65395..53feb179 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@ project(afio VERSION ${VERSIONSTRING} LANGUAGES CXX)
 set(PROJECT_NAMESPACE boost--)
 # This file should be updated with the last git SHA next commit
 UpdateRevisionHppFromGit("${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/revision.hpp")
-# Bring in CTest support
-include(CTest)
+# Setup this cmake environment for this project
+include(BoostLiteSetupProject)
 # Find my library dependencies
 find_boostish_library(boost-lite 1.0 REQUIRED)
 find_boostish_library(boost--outcome 1.0 REQUIRED)
@@ -42,14 +42,15 @@ include(BoostLiteMakeDoxygen)
 include(BoostLiteApplyDefaultDefinitions)
 # Set the C++ features this library requires
 all_compile_features(PUBLIC
-  # cxx_exceptions                        ## Annoyingly not supported by cmake 3.4
+  # cxx_exceptions                        ## Annoyingly not supported by cmake 3.6
   cxx_alias_templates
   cxx_variadic_templates
   cxx_noexcept
   cxx_constexpr
   cxx_thread_local
-  #cxx_init_captures                      ## Not supported yet by cmake 3.4
+  #cxx_init_captures                      ## Not supported yet by cmake 3.6
   cxx_attributes
+  cxx_generic_lambdas
 )
 if(NOT MSVC OR CMAKE_VERSION VERSION_GREATER 3.59)
   all_compile_features(PUBLIC
diff --git a/Readme.md b/Readme.md
index 7f0596d2..c2ad1deb 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,11 +7,11 @@ v2 rewrite. You can view its documentation at https://ned14.github.io/boost.afio
 
 CMake todos:
 - Add doxygen generation support
-  - Add ctest script to build the docs (and report warnings to cdash)
+  - Add ctest script to build the docs (and report warnings to cdash), pushing if
+    successful new docs to github (resetting the gh-pages SHA)
     - cmake --build . --target afio_docs
-  - Add -Wdocumentation when clang is in use. Add -fcomment-block-commands=complexity
-    etc for all our custom doxygen commands.
   - Get travis to push latest doxygen docs to github for me
+  - Merge all these improvements from AFIO back into Outcome
 - For non-embedded config, cmake should stamp git submodule SHAs so I can
 dispense with the upd method of submodule stamping
 - Static library edition appears to not be encoding extended error code detail?
diff --git a/include/boost/afio/afio.hpp b/include/boost/afio/afio.hpp
index 9710db3d..3a743bdb 100644
--- a/include/boost/afio/afio.hpp
+++ b/include/boost/afio/afio.hpp
@@ -1,7 +1,7 @@
 //! \file afio/afio.hpp The master *latest version* AFIO include file. All AFIO consuming libraries should include this header only.
 #include "version.hpp"
 
-#if defined(_MSC_VER) && !defined(__clang)
+#if defined(_MSC_VER) && !defined(__clang__)
 #define BOOST_AFIO_HEADERS_PATH2 BOOST_AFIO_VERSION_GLUE(v, BOOST_AFIO_HEADERS_VERSION, /afio.hpp)
 #else
 #define BOOST_AFIO_HEADERS_PATH2 BOOST_AFIO_VERSION_GLUE(v, BOOST_AFIO_HEADERS_VERSION,)/afio.hpp
diff --git a/include/boost/afio/v2.0/afio.hpp b/include/boost/afio/v2.0/afio.hpp
index 6c33fc3c..b26f2659 100644
--- a/include/boost/afio/v2.0/afio.hpp
+++ b/include/boost/afio/v2.0/afio.hpp
@@ -23,7 +23,7 @@
 #define BOOST_AFIO_NAMESPACE_VERSION   BOOST_AFIO_VERSION_GLUE(BOOST_AFIO_VERSION_MAJOR, _, BOOST_AFIO_VERSION_MINOR)
 
 #if defined(__cpp_modules) || defined(DOXYGEN_SHOULD_SKIP_THIS)
-#if defined(_MSC_VER) && !defined(__clang)
+#if defined(_MSC_VER) && !defined(__clang__)
 //! \brief The AFIO C++ module name
 #define BOOST_AFIO_MODULE_NAME BOOST_AFIO_VERSION_GLUE(afio_v, BOOST_AFIO_NAMESPACE_VERSION,)
 #else
diff --git a/include/boost/afio/v2.0/config.hpp b/include/boost/afio/v2.0/config.hpp
index 517e9845..338cbfff 100644
--- a/include/boost/afio/v2.0/config.hpp
+++ b/include/boost/afio/v2.0/config.hpp
@@ -116,6 +116,9 @@ DEALINGS IN THE SOFTWARE.
 #ifndef __cpp_variable_templates
 #error Boost.AFIO needs variable template support in the compiler
 #endif
+#ifndef __cpp_generic_lambdas
+#error Boost.AFIO needs generic lambda support in the compiler
+#endif
 #if(defined(__GNUC__) && !defined(__clang__))
 #define BOOST_AFIO_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #if BOOST_AFIO_GCC_VERSION < 40900
@@ -123,9 +126,6 @@ DEALINGS IN THE SOFTWARE.
 #endif
 #endif
 
-#if defined(BOOST_AFIO_LATEST_VERSION) && BOOST_AFIO_LATEST_VERSION < 2
-#error You need to include the latest version of Boost.AFIO before any earlier versions within the same translation unit
-#endif
 
 #include "../boost-lite/include/import.h"
 #undef BOOST_AFIO_V2_STL11_IMPL
diff --git a/include/boost/afio/version.hpp b/include/boost/afio/version.hpp
index 4474ebd8..3a130e55 100644
--- a/include/boost/afio/version.hpp
+++ b/include/boost/afio/version.hpp
@@ -25,7 +25,7 @@
 #define BOOST_AFIO_VERSION_GLUE(a, b, c)  BOOST_AFIO_VERSION_GLUE2(a, b, c)
 #define BOOST_AFIO_NAMESPACE_VERSION   BOOST_AFIO_VERSION_GLUE(BOOST_AFIO_VERSION_MAJOR, _, BOOST_AFIO_VERSION_MINOR)
 
-#if defined(_MSC_VER) && !defined(__clang)
+#if defined(_MSC_VER) && !defined(__clang__)
 #define BOOST_AFIO_HEADERS_VERSION     BOOST_AFIO_VERSION_GLUE(BOOST_AFIO_VERSION_MAJOR, ., BOOST_AFIO_VERSION_MINOR)
 #else
 #define BOOST_AFIO_HEADERS_VERSION     BOOST_AFIO_VERSION_MAJOR.BOOST_AFIO_VERSION_MINOR