diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-09 00:31:22 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-09 00:31:22 +0300 |
| commit | 753d7b1e90b433c135d96a9c3d94642f7148ca09 (patch) | |
| tree | 28baa0d7444f660a0db938d950d914eebe0d68cb | |
| parent | 8613f89fd6249cac815c7c1f1bdf3056c8478c3e (diff) | |
Try quoting args in travis.yml.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | include/llfio/revision.hpp | 6 | ||||
| -rw-r--r-- | include/llfio/v2.0/async_file_handle.hpp | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 4d31361e..0dd264b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,13 +83,13 @@ script: - if [ "$__" = "cmake tests" ] || [ "$__" = "x64 cmake tests (error_code)" ] || [ "$__" = "x64 cmake tests (status_code)" ]; then export ASAN_OPTIONS=detect_leaks=0; - ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ; + ctest -S .ci.cmake -V --timeout 300 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS" ; fi - if [ "$__" = "ARM32 cmake tests (error_code)" ] || [ "$__" = "ARM32 cmake tests (status_code)" ]; then export CXX=arm-linux-gnueabihf-g++; export CMAKE_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=armhf -DCMAKE_CXX_FLAGS="-Wno-attributes -Wno-psabi"; - ctest -S .ci.cmake -V --timeout 300 -DCTEST_DISABLE_TESTING=1 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ; + ctest -S .ci.cmake -V --timeout 300 -DCTEST_DISABLE_TESTING=1 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS" ; fi - if [ "$__" = "Documentation" ]; then diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index a138c7f9..4c17f712 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/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 LLFIO_PREVIOUS_COMMIT_REF 29b50c514e41b1571649b4282d4f91dffbe27c3d -#define LLFIO_PREVIOUS_COMMIT_DATE "2019-10-07 17:41:49 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE 29b50c51 +#define LLFIO_PREVIOUS_COMMIT_REF 8613f89fd6249cac815c7c1f1bdf3056c8478c3e +#define LLFIO_PREVIOUS_COMMIT_DATE "2019-10-08 21:00:32 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 8613f89f diff --git a/include/llfio/v2.0/async_file_handle.hpp b/include/llfio/v2.0/async_file_handle.hpp index dfdb4d6c..07f3a075 100644 --- a/include/llfio/v2.0/async_file_handle.hpp +++ b/include/llfio/v2.0/async_file_handle.hpp @@ -249,10 +249,10 @@ protected: dsync_async }; struct _erased_completion_handler; - #ifdef __clang__ - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdefaulted-function-deleted" - #endif +#if defined(__clang__) && __clang_major__ >= 8 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdefaulted-function-deleted" +#endif // Holds state for an i/o in progress. Will be subclassed with platform specific state and how to implement completion. struct _erased_io_state_type { @@ -312,7 +312,7 @@ protected: _erased_io_state_type &operator=(_erased_io_state_type &&) = default; _erased_io_state_type &operator=(const _erased_io_state_type &) = default; }; -#ifdef __clang__ +#if defined(__clang__) && __clang_major__ >= 8 #pragma clang diagnostic pop #endif struct _io_state_deleter |