Fixed clang -Wreserved-identifier warings

Created FMT_UNCHECKED_TYPE that resolves to special identifier _Unchecked_type for Microsoft, but to a dummy string otherwise. Using _Unchecked_type is invalid because underscore + uppercase is a reserved identifier.
fmtlib · Mar 9, 2022 · b30e335 · b30e335
1 parent 598df12
commit b30e335
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/include/fmt/compile.h b/include/fmt/compile.h
@@ -8,6 +8,7 @@
 #ifndef FMT_COMPILE_H_
 #define FMT_COMPILE_H_
 
+#include "core.h"
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
@@ -36,7 +37,7 @@ template <typename OutputIt> class truncating_iterator_base {
   using difference_type = std::ptrdiff_t;
   using pointer = void;
   using reference = void;
-  using _Unchecked_type =
+  using FMT_UNCHECKED_TYPE =
       truncating_iterator_base;  // Mark iterator as checked.
 
   OutputIt base() const { return out_; }

diff --git a/include/fmt/core.h b/include/fmt/core.h
@@ -217,6 +217,12 @@
 #  endif
 #endif
 
+#ifdef _MSC_VER
+#  define FMT_UNCHECKED_TYPE _Unchecked_type
+#else
+#  define FMT_UNCHECKED_TYPE DummyName
+#endif
+
 #ifndef FMT_BEGIN_NAMESPACE
 #  define FMT_BEGIN_NAMESPACE \
     namespace fmt {           \
@@ -1498,7 +1504,7 @@ class appender : public std::back_insert_iterator<detail::buffer<char>> {
  public:
   using std::back_insert_iterator<detail::buffer<char>>::back_insert_iterator;
   appender(base it) noexcept : base(it) {}
-  using _Unchecked_type = appender;  // Mark iterator as checked.
+  using FMT_UNCHECKED_TYPE = appender;  // Mark iterator as checked.
 
   auto operator++() noexcept -> appender& { return *this; }
 

diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -1848,7 +1848,7 @@ class counting_iterator {
   using difference_type = std::ptrdiff_t;
   using pointer = void;
   using reference = void;
-  using _Unchecked_type = counting_iterator;  // Mark iterator as checked.
+  using FMT_UNCHECKED_TYPE = counting_iterator;  // Mark iterator as checked.
 
   struct value_type {
     template <typename T> void operator=(const T&) {}