From 0e304a916da69b0367407bea496edd6477fed16d Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Fri, 27 Nov 2020 12:21:50 +0000 Subject: [PATCH] Work around build failure in status code config on VS2017. --- .github/workflows/make_release.yml | 8 ++++---- .github/workflows/unittests_windows.yml | 13 ++++++------- include/llfio/revision.hpp | 6 +++--- include/llfio/v2.0/status_code.hpp | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml index b6df352da..1ea51e7e1 100644 --- a/.github/workflows/make_release.yml +++ b/.github/workflows/make_release.yml @@ -148,8 +148,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: artifacts/Windows VS2019 error_code prebuilt binaries/llfio-v2.0-binaries-win64.zip - asset_name: llfio-v2.0-binaries-win64-vs2019-error_code.zip + asset_path: artifacts/Windows VS2017 error_code prebuilt binaries/llfio-v2.0-binaries-win64.zip + asset_name: llfio-v2.0-binaries-win64-vs2017-error_code.zip asset_content_type: application/zip - name: Upload Windows 2 @@ -159,6 +159,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: artifacts/Windows VS2019 status_code prebuilt binaries/llfio-v2.0-binaries-win64.zip - asset_name: llfio-v2.0-binaries-win64-vs2019-status_code.zip + asset_path: artifacts/Windows VS2017 status_code prebuilt binaries/llfio-v2.0-binaries-win64.zip + asset_name: llfio-v2.0-binaries-win64-vs2017-status_code.zip asset_content_type: application/zip diff --git a/.github/workflows/unittests_windows.yml b/.github/workflows/unittests_windows.yml index e19389244..f6c8a26c9 100644 --- a/.github/workflows/unittests_windows.yml +++ b/.github/workflows/unittests_windows.yml @@ -10,16 +10,15 @@ on: - cron: '0 0 1 * *' jobs: - WinVS2019: - name: Windows VS2019 -# runs-on: windows-2019 + WinVS2017: + name: Windows VS2017 runs-on: windows-2016 strategy: fail-fast: false matrix: configuration: [error_code, status_code] env: - NAME: WinVS2019-${{ matrix.configuration }} + NAME: WinVS2017-${{ matrix.configuration }} steps: - uses: actions/checkout@v2 @@ -35,19 +34,19 @@ jobs: - name: Upload Prebuilt Binaries uses: actions/upload-artifact@v2 with: - name: Windows VS2019 ${{ matrix.configuration }} prebuilt binaries + name: Windows VS2017 ${{ matrix.configuration }} prebuilt binaries path: llfio-v2.0-binaries-win64.zip - name: Upload Test Results if: always() uses: actions/upload-artifact@v2 with: - name: Windows VS2019 ${{ matrix.configuration }} test results + name: Windows VS2017 ${{ matrix.configuration }} test results path: prebuilt/merged_junit_results.xml publish-test-results: name: "Publish Unit Tests Results" - needs: [WinVS2019] + needs: [WinVS2017] runs-on: ubuntu-latest if: success() || failure() diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 6e590e9d4..2f36e80d4 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 cec7539cc88eee83d5d5059de730f8a9ea86d355 -#define LLFIO_PREVIOUS_COMMIT_DATE "2020-11-25 17:35:45 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE cec7539c +#define LLFIO_PREVIOUS_COMMIT_REF 27f1786d802b2e5045284ab71ca9977d8d3150f9 +#define LLFIO_PREVIOUS_COMMIT_DATE "2020-11-26 12:20:17 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 27f1786d diff --git a/include/llfio/v2.0/status_code.hpp b/include/llfio/v2.0/status_code.hpp index 0edf00697..80fd905d7 100644 --- a/include/llfio/v2.0/status_code.hpp +++ b/include/llfio/v2.0/status_code.hpp @@ -173,7 +173,7 @@ template class file_io_error_domain : public BaseSt //! \brief The value type of errors in LLFIO using value_type = detail::file_io_error_value_type; - file_io_error_domain() = default; + constexpr file_io_error_domain() {} // cannot be default else triggers a compile failure in VS2017 file_io_error_domain(const file_io_error_domain &) = default; file_io_error_domain(file_io_error_domain &&) = default; file_io_error_domain &operator=(const file_io_error_domain &) = default;