Support printing (const) volatile void*

Fixes #4049
fmtlib · Jul 7, 2024 · 63fb57c · 63fb57c
1 parent a433911
commit 63fb57c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/include/fmt/base.h b/include/fmt/base.h
@@ -1476,6 +1476,12 @@ template <typename Context> struct arg_mapper {
 
   FMT_MAP_API auto map(void* val) -> const void* { return val; }
   FMT_MAP_API auto map(const void* val) -> const void* { return val; }
+  FMT_MAP_API auto map(volatile void* val) -> const void* {
+    return const_cast<const void*>(val);
+  }
+  FMT_MAP_API auto map(const volatile void* val) -> const void* {
+    return const_cast<const void*>(val);
+  }
   FMT_MAP_API auto map(std::nullptr_t val) -> const void* { return val; }
 
   // Use SFINAE instead of a const T* parameter to avoid a conflict with the

diff --git a/test/base-test.cc b/test/base-test.cc
@@ -425,6 +425,21 @@ TEST(arg_test, pointer_arg) {
   CHECK_ARG_SIMPLE(cp);
 }
 
+TEST(arg_test, volatile_pointer_arg) {
+  auto check = [](const int val) {
+    CHECK_ARG(
+        char, reinterpret_cast<const void*>(val),
+        static_cast<volatile void*>(reinterpret_cast<volatile int*>(val)));
+    CHECK_ARG(char, reinterpret_cast<const void*>(val),
+              static_cast<const volatile void*>(
+                  reinterpret_cast<const volatile int*>(val)));
+  };
+  check(0);
+  check(1);
+  check(2);
+  check(0xbeef);
+}
+
 struct check_custom {
   auto operator()(fmt::basic_format_arg<fmt::format_context>::handle h) const
       -> test_result {