diff options
| -rw-r--r-- | .github/workflows/ci.yml | 14 | ||||
| -rw-r--r-- | include/llfio/revision.hpp | 6 | ||||
| -rw-r--r-- | include/llfio/v2.0/path_view.hpp | 29 |
3 files changed, 26 insertions, 23 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6ca8da9..ff93d49b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,11 +37,11 @@ jobs: export CMAKE_CONFIGURE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake"; fi if [ "${{ matrix.configuration }}" = "status_code" ]; then - export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON"; + export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS;-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON"; fi if [ "${{ matrix.compiler }}" = "arm-linux-gnueabihf-g++" ]; then - sudo apt install arm-linux-gnueabihf-g++ ; - ctest -S .ci.cmake -VV --timeout 600 -DCTEST_DISABLE_TESTING=1 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-arm.cmake"; + sudo apt install g++-arm-linux-gnueabihf; + ctest -S .ci.cmake -VV --timeout 600 -DCTEST_DISABLE_TESTING=1 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS;-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-arm.cmake"; else ctest -S .ci.cmake -VV --timeout 600 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS"; fi @@ -76,7 +76,7 @@ jobs: shell: bash run: | if [ "${{ matrix.configuration }}" = "status_code" ]; then - export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON" + export CMAKE_CONFIGURE_OPTIONS="-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON" fi ctest -S .ci.cmake -VV -E noexcept --timeout 600 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS" @@ -110,7 +110,7 @@ jobs: shell: bash run: | if [ "${{ matrix.configuration }}" = "status_code" ]; then - export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON" + export CMAKE_CONFIGURE_OPTIONS="-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON" fi ctest -S .ci.cmake -VV --timeout 600 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS" @@ -190,9 +190,9 @@ jobs: - name: Install shell: bash run: | - git config --system core.longpaths true + sudo git config --system core.longpaths true if [ "${{ matrix.configuration }}" = "status_code" ]; then - export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON" + export CMAKE_CONFIGURE_OPTIONS="-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON" fi git clone --depth 1 https://github.com/ned14/quickcpplib.git pip install --user gitpython diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index acdcd5a9..8bcc6683 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 e919b61352efdbf28a963ea81fcbea7ed4c7fd30 -#define LLFIO_PREVIOUS_COMMIT_DATE "2020-11-10 12:24:36 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE e919b613 +#define LLFIO_PREVIOUS_COMMIT_REF a03c3bcf558b00183131f9afa9223b348776c82f +#define LLFIO_PREVIOUS_COMMIT_DATE "2020-11-10 20:36:22 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE a03c3bcf diff --git a/include/llfio/v2.0/path_view.hpp b/include/llfio/v2.0/path_view.hpp index ac1f8eaf..588c50e7 100644 --- a/include/llfio/v2.0/path_view.hpp +++ b/include/llfio/v2.0/path_view.hpp @@ -608,9 +608,9 @@ public: return _invoke([](const auto &v) { using value_type = typename std::remove_reference<decltype(*v.data())>::type; #ifdef _WIN32 - const value_type *tofind = sizeof(value_type) > 1 ? (const value_type *) L"*?" : (const value_type *) "*?"; + const value_type *tofind = (sizeof(value_type) > 1) ? (const value_type *) L"*?" : (const value_type *) "*?"; #else - const value_type *tofind = sizeof(value_type) > 1 ? (const value_type *) L"*?[]" : (const value_type *) "*?[]"; + const value_type *tofind = (sizeof(value_type) > 1) ? (const value_type *) L"*?[]" : (const value_type *) "*?[]"; #endif return string_view::npos != v.find_first_of(tofind); }); @@ -1168,19 +1168,22 @@ public: , _deleter1arg(o._deleter1arg) , _deleter2(std::move(o._deleter2)) { - if(o.buffer == o._buffer) + if(this != &o) { - memcpy(_buffer, o._buffer, (o.length + 1) * sizeof(value_type)); - buffer = _buffer; - } - if(o._deleter1arg == &o._deleter2) - { - _deleter1arg = &_deleter2; + if(o.buffer == o._buffer) + { + memcpy(_buffer, o._buffer, (o.length + 1) * sizeof(value_type)); + buffer = _buffer; + } + if(o._deleter1arg == &o._deleter2) + { + _deleter1arg = &_deleter2; + } + o.buffer = nullptr; + o._bytes_to_delete = 0; + o._deleter1 = nullptr; + o._deleter1arg = nullptr; } - o.buffer = nullptr; - o._bytes_to_delete = 0; - o._deleter1 = nullptr; - o._deleter1arg = nullptr; } c_str &operator=(const c_str &) = delete; c_str &operator=(c_str &&o) noexcept |