diff options
author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-04-12 14:07:35 +0300 |
---|---|---|
committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-04-12 14:07:35 +0300 |
commit | 52e8fedbd57c3ba6d8587d2d48d13799dacc9b75 (patch) | |
tree | 9500822d8ab450cd6b5a8438521f6e0d920bd638 | |
parent | a1ed9cb9af4b6ab50010d1fad35ffd36ac31fb33 (diff) |
Finally fully compiling on Linux with GCC 6
-rw-r--r-- | CMakeLists.txt | 4 | ||||
m--------- | include/boost/afio/outcome | 0 | ||||
-rw-r--r-- | include/boost/afio/revision.hpp | 6 | ||||
-rw-r--r-- | include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp | 5 | ||||
-rw-r--r-- | release_notes.md | 2 | ||||
m--------- | test/kerneltest | 0 | ||||
-rw-r--r-- | test/tests/map_handle_create_close/runner.cpp | 1 | ||||
-rw-r--r-- | test/tests/section_handle_create_close/runner.cpp | 1 |
8 files changed, 14 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 13385665..e3c72713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,10 @@ 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 outcome_hl kerneltest_hl) +# Set the system dependencies this library has +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + all_link_libraries(PUBLIC stdc++fs rt) +endif() # Set any macros this library requires if(WIN32) all_compile_definitions(PRIVATE _WIN32_WINNT=0x600) ## Target WinVista diff --git a/include/boost/afio/outcome b/include/boost/afio/outcome -Subproject ac242bb745aee5d31ff689c6353ef28d9e9272b +Subproject 953e3a062c205d1222707aa67e012a89ab48abd diff --git a/include/boost/afio/revision.hpp b/include/boost/afio/revision.hpp index a41bed4d..8c4cbb44 100644 --- a/include/boost/afio/revision.hpp +++ b/include/boost/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 BOOST_AFIO_PREVIOUS_COMMIT_REF 8273a9a9e05bb9be7b3dc438860d2d96d37bd97a -#define BOOST_AFIO_PREVIOUS_COMMIT_DATE "2017-04-10 22:08:41 +00:00" -#define BOOST_AFIO_PREVIOUS_COMMIT_UNIQUE 8273a9a9 +#define BOOST_AFIO_PREVIOUS_COMMIT_REF a1ed9cb9af4b6ab50010d1fad35ffd36ac31fb33 +#define BOOST_AFIO_PREVIOUS_COMMIT_DATE "2017-04-12 10:28:18 +00:00" +#define BOOST_AFIO_PREVIOUS_COMMIT_UNIQUE a1ed9cb9 diff --git a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp b/include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp index 0f762d8e..6e80e694 100644 --- a/include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp +++ b/include/boost/afio/v2.0/algorithm/shared_fs_mutex/base.hpp @@ -87,7 +87,10 @@ namespace algorithm //! Default constructor constexpr entity_type() noexcept : _init(0) {} //! Constructor - BOOSTLITE_CONSTEXPR entity_type(value_type _value, bool _exclusive) noexcept : _init(0) +#if !defined(__GNUC__) || defined(__clang__) || __GNUC__ >= 7 + BOOSTLITE_CONSTEXPR +#endif + entity_type(value_type _value, bool _exclusive) noexcept : _init(0) { value = _value; exclusive = _exclusive; diff --git a/release_notes.md b/release_notes.md index ecf70ccf..bd374936 100644 --- a/release_notes.md +++ b/release_notes.md @@ -7,7 +7,7 @@ source code repository lives at https://github.com/ned14/boost.afio. yet. Nobody should use this code for anything serious. You need these compilers or better: -- GCC 5.0 +- GCC 6.0 - clang 3.7 - VS2015 Update 2 - clang 3.7 with Microsoft Codegen ("winclang") diff --git a/test/kerneltest b/test/kerneltest -Subproject e299d28b36611f54c69f9bd5da4a4bf18eaf3dd +Subproject 406edcf73b36e7a7584c25c1ec5190e45f1aa5c diff --git a/test/tests/map_handle_create_close/runner.cpp b/test/tests/map_handle_create_close/runner.cpp index e271ba21..b790dfcf 100644 --- a/test/tests/map_handle_create_close/runner.cpp +++ b/test/tests/map_handle_create_close/runner.cpp @@ -10,6 +10,7 @@ template <class U> inline void map_handle_create_close_(U &&f) { using namespace BOOST_KERNELTEST_V1_NAMESPACE; using namespace BOOST_AFIO_V2_NAMESPACE; + using BOOST_AFIO_V2_NAMESPACE::file_handle; // Create a temporary file and put some text into it file_handle temph; diff --git a/test/tests/section_handle_create_close/runner.cpp b/test/tests/section_handle_create_close/runner.cpp index c75fa0bd..7cf4d0c4 100644 --- a/test/tests/section_handle_create_close/runner.cpp +++ b/test/tests/section_handle_create_close/runner.cpp @@ -10,6 +10,7 @@ template <class U> inline void section_handle_create_close_(U &&f) { using namespace BOOST_KERNELTEST_V1_NAMESPACE; using namespace BOOST_AFIO_V2_NAMESPACE; + using BOOST_AFIO_V2_NAMESPACE::file_handle; // Create a temporary file and put some text into it file_handle temph; |