🎨 🐛 Rename all shadowed types and variables

2020-11-03 07:30:27 -08:00
parent 771292c328
commit e904e891bd
7 changed files with 41 additions and 42 deletions
@@ -108,8 +108,8 @@ TEST(TimeTest, TimePoint) {

 #define EXPECT_TIME(spec, time, duration)                 \
  {                                                       \
-    std::locale loc("ja_JP.utf8");                        \
-    EXPECT_EQ(format_tm(time, spec, loc),                 \
+    std::locale jp_loc("ja_JP.utf8");                     \
+    EXPECT_EQ(format_tm(time, spec, jp_loc),              \
              fmt::format(loc, "{:" spec "}", duration)); \
  }