var-name-clash.patch

   1 --- spdlog-1.12/include/spdlog/fmt/bundled/format.h~    2016-08-26 14:39:00.000000000 +0200
   2 +++ spdlog-1.12/include/spdlog/fmt/bundled/format.h     2020-06-09 22:31:27.877890734 +0200
   3 @@ -2195,29 +2195,29 @@
   4          typedef typename BasicWriter<Char>::CharPtr CharPtr;
   5          Char fill = internal::CharTraits<Char>::cast(spec_.fill());
   6          CharPtr out = CharPtr();
   7 -        const unsigned CHAR_WIDTH = 1;
   8 -        if (spec_.width_ > CHAR_WIDTH)
   9 +        const unsigned _SPD_CHAR_WIDTH = 1;
  10 +        if (spec_.width_ > _SPD_CHAR_WIDTH)
  11          {
  12              out = writer_.grow_buffer(spec_.width_);
  13              if (spec_.align_ == ALIGN_RIGHT)
  14              {
  15 -                std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, fill);
  16 -                out += spec_.width_ - CHAR_WIDTH;
  17 +                std::uninitialized_fill_n(out, spec_.width_ - _SPD_CHAR_WIDTH, fill);
  18 +                out += spec_.width_ - _SPD_CHAR_WIDTH;
  19              }
  20              else if (spec_.align_ == ALIGN_CENTER)
  21              {
  22                  out = writer_.fill_padding(out, spec_.width_,
  23 -                                           internal::const_check(CHAR_WIDTH), fill);
  24 +                                           internal::const_check(_SPD_CHAR_WIDTH), fill);
  25              }
  26              else
  27              {
  28 -                std::uninitialized_fill_n(out + CHAR_WIDTH,
  29 -                                          spec_.width_ - CHAR_WIDTH, fill);
  30 +                std::uninitialized_fill_n(out + _SPD_CHAR_WIDTH,
  31 +                                          spec_.width_ - _SPD_CHAR_WIDTH, fill);
  32              }
  33          }
  34          else
  35          {
  36 -            out = writer_.grow_buffer(CHAR_WIDTH);
  37 +            out = writer_.grow_buffer(_SPD_CHAR_WIDTH);
  38          }
  39          *out = internal::CharTraits<Char>::cast(value);
  40      }