From 8b83dfe593845d249664a65af1c0ab987abb91b3 Mon Sep 17 00:00:00 2001 From: Ben Deane Date: Mon, 14 Jul 2025 20:31:33 -0600 Subject: [PATCH] :arrow_up: Update stdx --- CMakeLists.txt | 2 +- include/msg/callback.hpp | 4 ++-- test/msg/message.cpp | 11 +---------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70202138..d049b864 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ include(cmake/string_catalog.cmake) add_versioned_package("gh:boostorg/mp11#boost-1.83.0") fmt_recipe(11.1.3) add_versioned_package("gh:intel/cpp-baremetal-concurrency#0ddce52") -add_versioned_package("gh:intel/cpp-std-extensions#3023efe") +add_versioned_package("gh:intel/cpp-std-extensions#73e1d48") add_versioned_package("gh:intel/cpp-baremetal-senders-and-receivers#22c8006") set(GEN_STR_CATALOG diff --git a/include/msg/callback.hpp b/include/msg/callback.hpp index c32d0e21..398005ed 100644 --- a/include/msg/callback.hpp +++ b/include/msg/callback.hpp @@ -33,10 +33,10 @@ struct callback { CIB_LOG_ENV(logging::get_level, logging::level::INFO); if (msg::call_with_message(matcher, data)) { CIB_APPEND_LOG_ENV(typename Msg::env_t); - auto const desc = matcher.describe(); CIB_LOG("Incoming message matched [{}], because [{}]{}, executing " "callback", - stdx::cts_t{}, desc, stdx::cts_t{}); + stdx::cts_t{}, matcher.describe(), + stdx::cts_t{}); msg::call_with_message(callable, data, std::forward(args)...); return true; diff --git a/test/msg/message.cpp b/test/msg/message.cpp index 972ca41b..dc54b687 100644 --- a/test/msg/message.cpp +++ b/test/msg/message.cpp @@ -379,16 +379,7 @@ TEST_CASE("less_than_or_equal_to matcher", "[message]") { TEST_CASE("describe a message", "[message]") { test_msg m{"f1"_field = 0xba11, "f2"_field = 0x42, "f3"_field = 0xd00d}; - auto const desc = m.describe(); -#if __clang_major__ == 14 - // workaround: clang-14 ICE with CIB_INFO here - logging::log>( - __FILE__, __LINE__, stdx::ct_format<"{}">(desc)); -#else - CIB_INFO("{}", desc); -#endif - + CIB_INFO("{}", m.describe()); CAPTURE(log_buffer); CHECK(log_buffer.find("msg(f1: 0xba11, id: 0x80, f3: 0xd00d, f2: 0x42)") != std::string::npos);