Skip to content

⬆️ Update stdx #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2025
Merged

⬆️ Update stdx #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/msg/callback.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ struct callback {
CIB_LOG_ENV(logging::get_level, logging::level::INFO);
if (msg::call_with_message<Msg>(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<Name>{}, desc, stdx::cts_t<Extra>{});
stdx::cts_t<Name>{}, matcher.describe(),
stdx::cts_t<Extra>{});
msg::call_with_message<Msg>(callable, data,
std::forward<Args>(args)...);
return true;
Expand Down
11 changes: 1 addition & 10 deletions test/msg/message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<stdx::extend_env_t<cib_log_env_t, logging::get_level,
logging::level::INFO>>(
__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);
Expand Down
Loading