From c62fa7f8ee665ad0b76d1bf3d23d62a2e8f92e4f Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Wed, 10 Jul 2024 17:50:54 -0400 Subject: [PATCH] Fixed C++20 issue with template id in constructor starting in gcc 11 (#1015) - See [C++20 DR 2237](https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2237) - Only made error starting in gcc 11 - gcc 14 switches to a warning `-Wtemplate-id-cdtor` - EbsdLib also had this issue which 1.0.30 resolves Signed-off-by: Jared Duffey --- .../SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp | 2 +- vcpkg-configuration.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp index 339d6b7778..ef51678d7e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp @@ -70,7 +70,7 @@ template class TSpecificCompareFunctor : public SegmentFeatures::CompareFunctor { public: - CX_DEFAULT_CONSTRUCTORS(TSpecificCompareFunctor) + CX_DEFAULT_CONSTRUCTORS(TSpecificCompareFunctor) using DataArrayType = DataArray; using DataStoreType = AbstractDataStore; diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 9802084168..558b809fa6 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -33,7 +33,7 @@ "zlib", "zstd" ], - "baseline": "e2836a9d0b7a26d5063b5e5a51a1b10b1246f4e8" + "baseline": "ed3fc6a2a4acac755b8006db8752496c585b830c" } ] }