From 1b4a32262c95da83780dce47f3bd5563530fa7db Mon Sep 17 00:00:00 2001 From: "Jonathan M. Waldrop" Date: Wed, 19 Nov 2025 12:44:14 -0600 Subject: [PATCH 1/3] C++-20 changes --- CMakeLists.txt | 1 + include/tensorwrapper/shape/smooth_view.hpp | 2 +- src/tensorwrapper/shape/smooth_view.cpp | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ade5882..2cabe7d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ include(cmake/get_nwx_cmake.cmake) #Sets the version to whatever git thinks it is include(get_version_from_git) get_version_from_git(tensorwrapper_version "${CMAKE_CURRENT_LIST_DIR}") +set(CMAKE_CXX_STANDARD 20) project(tensorwrapper VERSION "${tensorwrapper_version}" LANGUAGES CXX) include(nwx_versions) diff --git a/include/tensorwrapper/shape/smooth_view.hpp b/include/tensorwrapper/shape/smooth_view.hpp index f26d412e..b65cb7c3 100644 --- a/include/tensorwrapper/shape/smooth_view.hpp +++ b/include/tensorwrapper/shape/smooth_view.hpp @@ -198,7 +198,7 @@ class SmoothView { * * @throw None No throw guarantee. */ - bool operator==(const SmoothView& rhs) const noexcept; + bool operator==(const SmoothView& rhs) const noexcept; /** @brief Is *this different from @p rhs? * diff --git a/src/tensorwrapper/shape/smooth_view.cpp b/src/tensorwrapper/shape/smooth_view.cpp index 78aa5aa6..ccdadc3a 100644 --- a/src/tensorwrapper/shape/smooth_view.cpp +++ b/src/tensorwrapper/shape/smooth_view.cpp @@ -70,11 +70,10 @@ void SMOOTH_VIEW::swap(SmoothView& rhs) noexcept { } TPARAMS -bool SMOOTH_VIEW::operator==( - const SmoothView& rhs) const noexcept { +bool SMOOTH_VIEW::operator==(const SmoothView& rhs) const noexcept { if(has_pimpl_() != rhs.has_pimpl_()) return false; if(!has_pimpl_()) return true; - return m_pimpl_->as_const()->are_equal(*rhs.m_pimpl_); + return m_pimpl_->are_equal(*rhs.m_pimpl_); } TPARAMS From 776f93a038c364f5b5a734cb25776d6bb1fb8219 Mon Sep 17 00:00:00 2001 From: "Jonathan M. Waldrop" Date: Wed, 19 Nov 2025 12:48:20 -0600 Subject: [PATCH 2/3] Update GHA PR workflow compilers --- .github/workflows/pull_request.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 8bf142a7..5f8a5b10 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -32,10 +32,10 @@ jobs: test_library: uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master with: - compilers: '["gcc-11", "clang-14"]' + compilers: '["gcc-13", "clang-14"]' test_library_with_sigma: uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master with: - compilers: '["gcc-11", "clang-14"]' + compilers: '["gcc-13", "clang-14"]' repo_toolchain: ".github/enable_sigma.cmake" From 3f5383cfc40514f93c4184d3411ee02cf2c86f21 Mon Sep 17 00:00:00 2001 From: "Jonathan M. Waldrop" Date: Wed, 19 Nov 2025 15:49:56 -0600 Subject: [PATCH 3/3] update GHA workflow compilers --- .github/workflows/pull_request.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 5f8a5b10..a9527041 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -32,10 +32,10 @@ jobs: test_library: uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master with: - compilers: '["gcc-13", "clang-14"]' + compilers: '["gcc-14", "clang-19"]' test_library_with_sigma: uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master with: - compilers: '["gcc-13", "clang-14"]' + compilers: '["gcc-14", "clang-19"]' repo_toolchain: ".github/enable_sigma.cmake"