Workaround C complex.h idiocy

fmtlib · Sep 3, 2022 · aec3bb5 · aec3bb5
1 parent 29c6000
commit aec3bb5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
@@ -211,16 +211,16 @@ class is_tuple_formattable_ {
   static constexpr const bool value = false;
 };
 template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
-  template <std::size_t... I>
-  static std::true_type check2(index_sequence<I...>,
-                               integer_sequence<bool, (I == I)...>);
+  template <std::size_t... Is>
+  static std::true_type check2(index_sequence<Is...>,
+                               integer_sequence<bool, (Is == Is)...>);
   static std::false_type check2(...);
-  template <std::size_t... I>
+  template <std::size_t... Is>
   static decltype(check2(
-      index_sequence<I...>{},
+      index_sequence<Is...>{},
       integer_sequence<
-          bool, (is_formattable<typename std::tuple_element<I, T>::type,
-                                C>::value)...>{})) check(index_sequence<I...>);
+          bool, (is_formattable<typename std::tuple_element<Is, T>::type,
+                                C>::value)...>{})) check(index_sequence<Is...>);
 
  public:
   static constexpr const bool value =

diff --git a/include/fmt/std.h b/include/fmt/std.h
@@ -101,17 +101,16 @@ template <typename T>
 using variant_index_sequence =
     std::make_index_sequence<std::variant_size<T>::value>;
 
-template <typename>
-struct is_variant_like_ : std::false_type {};
+template <typename> struct is_variant_like_ : std::false_type {};
 template <typename... Types>
 struct is_variant_like_<std::variant<Types...>> : std::true_type {};
 
 // formattable element check.
 template <typename T, typename C> class is_variant_formattable_ {
-  template <std::size_t... I>
+  template <std::size_t... Is>
   static std::conjunction<
-      is_formattable<std::variant_alternative_t<I, T>, C>...>
-      check(std::index_sequence<I...>);
+      is_formattable<std::variant_alternative_t<Is, T>, C>...>
+      check(std::index_sequence<Is...>);
 
  public:
   static constexpr const bool value =

diff --git a/test/core-test.cc b/test/core-test.cc
@@ -9,9 +9,7 @@
 #include "test-assert.h"
 // clang-format on
 
-#define I 42  // simulate https://en.cppreference.com/w/c/numeric/complex/I
 #include "fmt/core.h"
-#undef I
 
 #include <algorithm>    // std::copy_n
 #include <climits>      // INT_MAX

diff --git a/test/enforce-checks-test.cc b/test/enforce-checks-test.cc
@@ -8,12 +8,14 @@
 #include <iterator>
 #include <vector>
 
+#define I 42  // simulate https://en.cppreference.com/w/c/numeric/complex/I
 #include "fmt/chrono.h"
 #include "fmt/color.h"
 #include "fmt/format.h"
 #include "fmt/ostream.h"
 #include "fmt/ranges.h"
 #include "fmt/xchar.h"
+#undef I
 
 // Exercise the API to verify that everything we expect to can compile.
 void test_format_api() {