diff --git a/subprojects/abseil-cpp.wrap b/subprojects/abseil-cpp.wrap index 9a8e072..eba8e75 100644 --- a/subprojects/abseil-cpp.wrap +++ b/subprojects/abseil-cpp.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = abseil-cpp-20240722.0 -source_url = https://github.com/abseil/abseil-cpp/releases/download/20240722.0/abseil-cpp-20240722.0.tar.gz -source_filename = abseil-cpp-20240722.0.tar.gz -source_hash = f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3 -patch_filename = abseil-cpp_20240722.0-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20240722.0-1/get_patch -patch_hash = 692bbbc39cacaba4dc4b0c8b2fbbe32736c9cde6377acfa0d52088797af14ded -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_20240722.0-1/abseil-cpp-20240722.0.tar.gz -wrapdb_version = 20240722.0-1 +directory = abseil-cpp-20250814.1 +source_url = https://github.com/abseil/abseil-cpp/releases/download/20250814.1/abseil-cpp-20250814.1.tar.gz +source_filename = abseil-cpp-20250814.1.tar.gz +source_hash = 1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1 +patch_filename = abseil-cpp_20250814.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20250814.1-1/get_patch +patch_hash = f44ad4d72ff2919a6a48cf0887f69aef34c338bfdd8931153596e3766d75f654 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_20250814.1-1/abseil-cpp-20250814.1.tar.gz +wrapdb_version = 20250814.1-1 [provide] absl_base = absl_base_dep diff --git a/subprojects/doctest.wrap b/subprojects/doctest.wrap index f9a150f..403bcec 100644 --- a/subprojects/doctest.wrap +++ b/subprojects/doctest.wrap @@ -1,10 +1,10 @@ [wrap-file] -directory = doctest-2.4.11 -source_url = https://github.com/doctest/doctest/archive/refs/tags/v2.4.11.tar.gz -source_filename = doctest-2.4.11.tar.gz -source_hash = 632ed2c05a7f53fa961381497bf8069093f0d6628c5f26286161fbd32a560186 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/doctest_2.4.11-1/doctest-2.4.11.tar.gz -wrapdb_version = 2.4.11-1 +directory = doctest-2.4.12 +source_url = https://github.com/doctest/doctest/archive/refs/tags/v2.4.12.tar.gz +source_filename = doctest-2.4.12.tar.gz +source_hash = 73381c7aa4dee704bd935609668cf41880ea7f19fa0504a200e13b74999c2d70 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/doctest_2.4.12-1/doctest-2.4.12.tar.gz +wrapdb_version = 2.4.12-1 [provide] dependency_names = doctest diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap index fd50847..b74c540 100644 --- a/subprojects/fmt.wrap +++ b/subprojects/fmt.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = fmt-11.0.2 -source_url = https://github.com/fmtlib/fmt/archive/11.0.2.tar.gz -source_filename = fmt-11.0.2.tar.gz -source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f -patch_filename = fmt_11.0.2-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch -patch_hash = 90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz -wrapdb_version = 11.0.2-1 +directory = fmt-11.2.0 +source_url = https://github.com/fmtlib/fmt/archive/11.2.0.tar.gz +source_filename = fmt-11.2.0.tar.gz +source_hash = bc23066d87ab3168f27cef3e97d545fa63314f5c79df5ea444d41d56f962c6af +patch_filename = fmt_11.2.0-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.2.0-2/get_patch +patch_hash = cc555cbfc9e334d5b670763894586ad6fbaf7f85eb5e67221cfe519b919c6542 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.2.0-2/fmt-11.2.0.tar.gz +wrapdb_version = 11.2.0-2 [provide] -fmt = fmt_dep +dependency_names = fmt diff --git a/test/app/doctest.cpp b/test/app/doctest.cpp index 7079a49..3861c02 100644 --- a/test/app/doctest.cpp +++ b/test/app/doctest.cpp @@ -1,5 +1,5 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN -#include +#include namespace doctest { diff --git a/test/app/doctest.h b/test/app/doctest.h index 2e16581..52654cc 100644 --- a/test/app/doctest.h +++ b/test/app/doctest.h @@ -3,7 +3,14 @@ #include #include +#if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-W#warnings" +#endif #include +#if defined(__clang__) +# pragma clang diagnostic pop +#endif #if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) # undef DOCTEST_REQUIRE diff --git a/test/bench/quick_overall_map.cpp b/test/bench/quick_overall_map.cpp index 50ed5c2..4028e6d 100644 --- a/test/bench/quick_overall_map.cpp +++ b/test/bench/quick_overall_map.cpp @@ -1,9 +1,9 @@ #include // for map, hash +#include // for TestCase, skip, ResultBuilder #include // for geomean #include // for Rng, doNotOptimizeAway, Bench -#include // for TestCase, skip, ResultBuilder #include // for print, format #include // for duration, operator-, high_resolu... diff --git a/test/bench/show_allocations.cpp b/test/bench/show_allocations.cpp index 2158e19..1afe9e6 100644 --- a/test/bench/show_allocations.cpp +++ b/test/bench/show_allocations.cpp @@ -2,7 +2,7 @@ #include // for map, operator== #include - +#include #include #if __has_include("boost/unordered/unordered_flat_map.hpp") @@ -16,7 +16,6 @@ # define HAS_BOOST_UNORDERED_FLAT_MAP() 0 // NOLINT(cppcoreguidelines-macro-usage) #endif -#include #include #include diff --git a/test/bench/swap.cpp b/test/bench/swap.cpp index 74d1eba..70ce354 100644 --- a/test/bench/swap.cpp +++ b/test/bench/swap.cpp @@ -1,7 +1,7 @@ #include // for map +#include // for TestCase, skip, TEST_CASE, test_... #include // for Rng, doNotOptimizeAway, Bench -#include // for TestCase, skip, TEST_CASE, test_... #include // for format #include // for size_t diff --git a/test/meson.build b/test/meson.build index 302b736..6dd6ea0 100644 --- a/test/meson.build +++ b/test/meson.build @@ -171,7 +171,7 @@ test_exe = executable( # see what's in the [provide] sections for the dependency names dependency('doctest'), - dependency('fmt', method: fmt_method), + dependency('fmt', method: fmt_method, fallback: ['fmt', 'fmt_dep']), # disable these two if you don't want them #dependency('boost'), diff --git a/test/unit/deduction_guides.cpp b/test/unit/deduction_guides.cpp index 4f24791..b45382a 100644 --- a/test/unit/deduction_guides.cpp +++ b/test/unit/deduction_guides.cpp @@ -1,4 +1,4 @@ -#include // for TestCase, skip, TEST_CASE, test_... +#include // for TestCase, skip, TEST_CASE, test_... TEST_CASE("deduction_guide") { // TODO(martinus) not yet possible, only in c++20. See diff --git a/test/unit/hash.cpp b/test/unit/hash.cpp index bf3005e..88fc9bc 100644 --- a/test/unit/hash.cpp +++ b/test/unit/hash.cpp @@ -1,6 +1,5 @@ #include - -#include // for ResultBuilder, TestCase, REQUIRE +#include // for ResultBuilder, TestCase, REQUIRE #include // for size_t #include // for uint64_t diff --git a/test/unit/hash_char_types.cpp b/test/unit/hash_char_types.cpp index fa00623..6e3d4fc 100644 --- a/test/unit/hash_char_types.cpp +++ b/test/unit/hash_char_types.cpp @@ -1,4 +1,4 @@ -#include +#include TEST_CASE("hash_char_types") { // TODO(martinus) make hash generic? diff --git a/test/unit/hash_smart_ptr.cpp b/test/unit/hash_smart_ptr.cpp index acd6096..6313203 100644 --- a/test/unit/hash_smart_ptr.cpp +++ b/test/unit/hash_smart_ptr.cpp @@ -1,6 +1,6 @@ #include -#include // for ResultBuilder, TestCase, REQUIRE +#include // for ResultBuilder, TestCase, REQUIRE #include // for uint64_t #include // for shared_ptr, __unique_ptr_t, make... diff --git a/test/unit/hash_string_view.cpp b/test/unit/hash_string_view.cpp index 034854c..37bf5a6 100644 --- a/test/unit/hash_string_view.cpp +++ b/test/unit/hash_string_view.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/test/unit/namespace.cpp b/test/unit/namespace.cpp index e4e8f56..d63c01c 100644 --- a/test/unit/namespace.cpp +++ b/test/unit/namespace.cpp @@ -1,6 +1,5 @@ #include - -#include +#include namespace versioned_namespace = ankerl::unordered_dense::v4_5_0; diff --git a/test/unit/std_hash.cpp b/test/unit/std_hash.cpp index f9df6fd..a01e936 100644 --- a/test/unit/std_hash.cpp +++ b/test/unit/std_hash.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include // for size_t #include // for allocator, string, operator== diff --git a/test/unit/windows_include.cpp b/test/unit/windows_include.cpp index 7af5bef..a04f311 100644 --- a/test/unit/windows_include.cpp +++ b/test/unit/windows_include.cpp @@ -7,8 +7,7 @@ #include #include - -#include +#include #include