Skip to content

Commit da6cb26

Browse files
authored
Merge pull request #745 from elbeno/update-stdx
⬆️ Update stdx
2 parents adc423f + 8b83dfe commit da6cb26

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include(cmake/string_catalog.cmake)
2525
add_versioned_package("gh:boostorg/mp11#boost-1.83.0")
2626
fmt_recipe(11.1.3)
2727
add_versioned_package("gh:intel/cpp-baremetal-concurrency#0ddce52")
28-
add_versioned_package("gh:intel/cpp-std-extensions#3023efe")
28+
add_versioned_package("gh:intel/cpp-std-extensions#73e1d48")
2929
add_versioned_package("gh:intel/cpp-baremetal-senders-and-receivers#22c8006")
3030

3131
set(GEN_STR_CATALOG

include/msg/callback.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ struct callback {
3333
CIB_LOG_ENV(logging::get_level, logging::level::INFO);
3434
if (msg::call_with_message<Msg>(matcher, data)) {
3535
CIB_APPEND_LOG_ENV(typename Msg::env_t);
36-
auto const desc = matcher.describe();
3736
CIB_LOG("Incoming message matched [{}], because [{}]{}, executing "
3837
"callback",
39-
stdx::cts_t<Name>{}, desc, stdx::cts_t<Extra>{});
38+
stdx::cts_t<Name>{}, matcher.describe(),
39+
stdx::cts_t<Extra>{});
4040
msg::call_with_message<Msg>(callable, data,
4141
std::forward<Args>(args)...);
4242
return true;

test/msg/message.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -379,16 +379,7 @@ TEST_CASE("less_than_or_equal_to matcher", "[message]") {
379379

380380
TEST_CASE("describe a message", "[message]") {
381381
test_msg m{"f1"_field = 0xba11, "f2"_field = 0x42, "f3"_field = 0xd00d};
382-
auto const desc = m.describe();
383-
#if __clang_major__ == 14
384-
// workaround: clang-14 ICE with CIB_INFO here
385-
logging::log<stdx::extend_env_t<cib_log_env_t, logging::get_level,
386-
logging::level::INFO>>(
387-
__FILE__, __LINE__, stdx::ct_format<"{}">(desc));
388-
#else
389-
CIB_INFO("{}", desc);
390-
#endif
391-
382+
CIB_INFO("{}", m.describe());
392383
CAPTURE(log_buffer);
393384
CHECK(log_buffer.find("msg(f1: 0xba11, id: 0x80, f3: 0xd00d, f2: 0x42)") !=
394385
std::string::npos);

0 commit comments

Comments
 (0)