diff --git a/.jenkins/lsu/env-hipcc.sh b/.jenkins/lsu/env-hipcc.sh index 307beddd95d0..06903456b326 100644 --- a/.jenkins/lsu/env-hipcc.sh +++ b/.jenkins/lsu/env-hipcc.sh @@ -24,3 +24,4 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON" configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=OFF" ctest_extra_args+=" -E tests.unit.modules.algorithms.detail " +ctest_extra_args+=" -E tests.regressions.modules.coroutines.coroutine_function_destructor_yield_4800" diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp index d6469ec8d497..5721e9d19e14 100644 --- a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp +++ b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp index 7c21cf8acdc3..ff5f6fd11b21 100644 --- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp +++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/libs/core/format/include/hpx/modules/format.hpp b/libs/core/format/include/hpx/modules/format.hpp index 73427ee3c115..e0d2464457c7 100644 --- a/libs/core/format/include/hpx/modules/format.hpp +++ b/libs/core/format/include/hpx/modules/format.hpp @@ -317,8 +317,7 @@ namespace hpx::util { os << value.delim; first = false; - using value_type = std::decay_t; - detail::formatter::call(os, spec, &elem); + detail::formatter::call(os, spec, &elem); } } }; diff --git a/libs/core/format/tests/unit/format.cpp b/libs/core/format/tests/unit/format.cpp index 58528e7314b4..c2ce743cb468 100644 --- a/libs/core/format/tests/unit/format.cpp +++ b/libs/core/format/tests/unit/format.cpp @@ -15,34 +15,35 @@ int main(int argc, char* argv[]) { - using hpx::util::format; { - HPX_TEST_EQ((format("Hello")), "Hello"); - HPX_TEST_EQ((format("Hello, {}!", "world")), "Hello, world!"); - HPX_TEST_EQ((format("The number is {}", 1)), "The number is 1"); + HPX_TEST_EQ((hpx::util::format("Hello")), "Hello"); + HPX_TEST_EQ( + (hpx::util::format("Hello, {}!", "world")), "Hello, world!"); + HPX_TEST_EQ( + (hpx::util::format("The number is {}", 1)), "The number is 1"); } { - HPX_TEST_EQ((format("{} {}", 1, 2)), "1 2"); - HPX_TEST_EQ((format("{} {1}", 1, 2)), "1 1"); - HPX_TEST_EQ((format("{2} {}", 1, 2)), "2 2"); - HPX_TEST_EQ((format("{2} {1}", 1, 2)), "2 1"); + HPX_TEST_EQ((hpx::util::format("{} {}", 1, 2)), "1 2"); + HPX_TEST_EQ((hpx::util::format("{} {1}", 1, 2)), "1 1"); + HPX_TEST_EQ((hpx::util::format("{2} {}", 1, 2)), "2 2"); + HPX_TEST_EQ((hpx::util::format("{2} {1}", 1, 2)), "2 1"); - HPX_TEST_EQ((format("{:}", 42)), "42"); - HPX_TEST_EQ((format("{:04}", 42)), "0042"); - HPX_TEST_EQ((format("{2:04}", 42, 43)), "0043"); + HPX_TEST_EQ((hpx::util::format("{:}", 42)), "42"); + HPX_TEST_EQ((hpx::util::format("{:04}", 42)), "0042"); + HPX_TEST_EQ((hpx::util::format("{2:04}", 42, 43)), "0043"); - HPX_TEST_EQ((format("{:x}", 42)), "2a"); - HPX_TEST_EQ((format("{:04x}", 42)), "002a"); - HPX_TEST_EQ((format("{2:04x}", 42, 43)), "002b"); + HPX_TEST_EQ((hpx::util::format("{:x}", 42)), "2a"); + HPX_TEST_EQ((hpx::util::format("{:04x}", 42)), "002a"); + HPX_TEST_EQ((hpx::util::format("{2:04x}", 42, 43)), "002b"); - HPX_TEST_EQ((format("{:#x}", 42)), "0x2a"); - HPX_TEST_EQ((format("{:#06x}", 42)), "0x002a"); - HPX_TEST_EQ((format("{2:#06x}", 42, 43)), "0x002b"); + HPX_TEST_EQ((hpx::util::format("{:#x}", 42)), "0x2a"); + HPX_TEST_EQ((hpx::util::format("{:#06x}", 42)), "0x002a"); + HPX_TEST_EQ((hpx::util::format("{2:#06x}", 42, 43)), "0x002b"); } { - HPX_TEST_EQ((format("{} {}", true, false)), "1 0"); + HPX_TEST_EQ((hpx::util::format("{} {}", true, false)), "1 0"); } { @@ -50,29 +51,30 @@ int main(int argc, char* argv[]) std::tm tm = *std::localtime(&t); char buffer[64] = {}; std::strftime(buffer, 64, "%c", &tm); - HPX_TEST_EQ((format("{}", tm)), buffer); + HPX_TEST_EQ((hpx::util::format("{}", tm)), buffer); std::strftime(buffer, 64, "%A %c", &tm); - HPX_TEST_EQ((format("{:%A %c}", tm)), buffer); + HPX_TEST_EQ((hpx::util::format("{:%A %c}", tm)), buffer); } { using hpx::util::format_join; std::vector const vs = {42, 43}; - HPX_TEST_EQ((format("{}", format_join(vs, ""))), "4243"); - HPX_TEST_EQ((format("{}", format_join(vs, ","))), "42,43"); - HPX_TEST_EQ((format("{:x}", format_join(vs, ""))), "2a2b"); - HPX_TEST_EQ((format("{:04x}", format_join(vs, ","))), "002a,002b"); + HPX_TEST_EQ((hpx::util::format("{}", format_join(vs, ""))), "4243"); + HPX_TEST_EQ((hpx::util::format("{}", format_join(vs, ","))), "42,43"); + HPX_TEST_EQ((hpx::util::format("{:x}", format_join(vs, ""))), "2a2b"); + HPX_TEST_EQ( + (hpx::util::format("{:04x}", format_join(vs, ","))), "002a,002b"); } { - HPX_TEST_EQ((format("{{ {}", 1)), "{ 1"); - HPX_TEST_EQ((format("}} {}", 1)), "} 1"); - HPX_TEST_EQ((format("{{}} {}", 1)), "{} 1"); - HPX_TEST_EQ((format("{} {{}}", 1)), "1 {}"); - HPX_TEST_EQ((format("{} {{", 1)), "1 {"); - HPX_TEST_EQ((format("{} }}", 1)), "1 }"); - HPX_TEST_EQ((format("{{{1}}}", 2)), "{2}"); + HPX_TEST_EQ((hpx::util::format("{{ {}", 1)), "{ 1"); + HPX_TEST_EQ((hpx::util::format("}} {}", 1)), "} 1"); + HPX_TEST_EQ((hpx::util::format("{{}} {}", 1)), "{} 1"); + HPX_TEST_EQ((hpx::util::format("{} {{}}", 1)), "1 {}"); + HPX_TEST_EQ((hpx::util::format("{} {{", 1)), "1 {"); + HPX_TEST_EQ((hpx::util::format("{} }}", 1)), "1 }"); + HPX_TEST_EQ((hpx::util::format("{{{1}}}", 2)), "{2}"); } return hpx::util::report_errors(); diff --git a/libs/core/type_support/tests/unit/generator.cpp b/libs/core/type_support/tests/unit/generator.cpp index 0bb35a2d0302..5d080d7fac93 100644 --- a/libs/core/type_support/tests/unit/generator.cpp +++ b/libs/core/type_support/tests/unit/generator.cpp @@ -202,8 +202,8 @@ namespace tests { } }; - // gcc V11/V12 are complaining about mismatched-new-delete -#if !defined(HPX_GCC_VERSION) || HPX_GCC_VERSION >= 140000 + // gcc V11 and on are complaining about mismatched-new-delete +#if !defined(HPX_GCC_VERSION) || HPX_GCC_VERSION >= 150000 hpx::generator> stateless_example() { co_yield 42; @@ -313,8 +313,8 @@ int main() HPX_TEST_EQ(i, expected.size()); } - // gcc V11/V12 are complaining about mismatched-new-delete -#if !defined(HPX_GCC_VERSION) || HPX_GCC_VERSION >= 140000 + // gcc V11 and on are complaining about mismatched-new-delete +#if !defined(HPX_GCC_VERSION) || HPX_GCC_VERSION >= 150000 { std::vector const expected = {42}; std::size_t i = 0;