external/boost/boost.date_time.Wshadow.warnings.patch.1

   1 --- a/boost/date_time/time_facet.hpp
   2 +++ b/boost/date_time/time_facet.hpp
   3 @@ -439,31 +439,31 @@
   4                                time_dur_arg.get_rep().as_special());
   5        }
   6
   7 -      string_type format(m_time_duration_format);
   8 +      string_type local_format(m_time_duration_format);
   9        if (time_dur_arg.is_negative()) {
  10          // replace %- with minus sign.  Should we use the numpunct facet?
  11 -        boost::algorithm::replace_all(format,
  12 +        boost::algorithm::replace_all(local_format,
  13                                        duration_sign_negative_only,
  14                                        negative_sign);
  15            // remove all the %+ in the string with '-'
  16 -        boost::algorithm::replace_all(format,
  17 +        boost::algorithm::replace_all(local_format,
  18                                        duration_sign_always,
  19                                        negative_sign);
  20        }
  21        else { //duration is positive
  22          // remove all the %- combos from the string
  23 -        boost::algorithm::erase_all(format, duration_sign_negative_only);
  24 +        boost::algorithm::erase_all(local_format, duration_sign_negative_only);
  25          // remove all the %+ in the string with '+'
  26 -        boost::algorithm::replace_all(format,
  27 +        boost::algorithm::replace_all(local_format,
  28                                        duration_sign_always,
  29                                        positive_sign);
  30        }
  31
  32        // %T and %R have to be replaced here since they are not standard
  33 -      boost::algorithm::replace_all(format,
  34 +      boost::algorithm::replace_all(local_format,
  35          boost::as_literal(formats_type::full_24_hour_time_format),
  36          boost::as_literal(formats_type::full_24_hour_time_expanded_format));
  37 -      boost::algorithm::replace_all(format,
  38 +      boost::algorithm::replace_all(local_format,
  39          boost::as_literal(formats_type::short_24_hour_time_format),
  40          boost::as_literal(formats_type::short_24_hour_time_expanded_format));
  41
  42 @@ -476,22 +476,22 @@
  43         * here ourself.
  44         */
  45        string_type hours_str;
  46 -      if (format.find(unrestricted_hours_format) != string_type::npos) {
  47 +      if (local_format.find(unrestricted_hours_format) != string_type::npos) {
  48          hours_str = hours_as_string(time_dur_arg);
  49 -        boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
  50 +        boost::algorithm::replace_all(local_format, unrestricted_hours_format, hours_str);
  51        }
  52        // We still have to process restricted hours format specifier. In order to
  53        // support parseability of durations in ISO format (%H%M%S), we'll have to
  54        // restrict the stringified hours length to 2 characters.
  55 -      if (format.find(hours_format) != string_type::npos) {
  56 +      if (local_format.find(hours_format) != string_type::npos) {
  57          if (hours_str.empty())
  58            hours_str = hours_as_string(time_dur_arg);
  59          BOOST_ASSERT(hours_str.length() <= 2);
  60 -        boost::algorithm::replace_all(format, hours_format, hours_str);
  61 +        boost::algorithm::replace_all(local_format, hours_format, hours_str);
  62        }
  63
  64        string_type frac_str;
  65 -      if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
  66 +      if (local_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
  67          // replace %s with %S.nnn
  68          frac_str =
  69            fractional_seconds_as_string(time_dur_arg, false);
  70 @@ -500,21 +500,21 @@
  71          string_type replace_string(seconds_format);
  72          replace_string += sep;
  73          replace_string += frac_str;
  74 -        boost::algorithm::replace_all(format,
  75 +        boost::algorithm::replace_all(local_format,
  76                                        seconds_with_fractional_seconds_format,
  77                                        replace_string);
  78        }
  79 -      if (format.find(fractional_seconds_format) != string_type::npos) {
  80 +      if (local_format.find(fractional_seconds_format) != string_type::npos) {
  81          // replace %f with nnnnnnn
  82          if (!frac_str.size()) {
  83            frac_str = fractional_seconds_as_string(time_dur_arg, false);
  84          }
  85 -        boost::algorithm::replace_all(format,
  86 +        boost::algorithm::replace_all(local_format,
  87                                        fractional_seconds_format,
  88                                        frac_str);
  89        }
  90
  91 -      if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
  92 +      if (local_format.find(fractional_seconds_or_none_format) != string_type::npos) {
  93          // replace %F with nnnnnnn or nothing if fs == 0
  94          frac_str =
  95            fractional_seconds_as_string(time_dur_arg, true);
  96 @@ -523,18 +523,18 @@
  97            string_type replace_string;
  98            replace_string += sep;
  99            replace_string += frac_str;
 100 -          boost::algorithm::replace_all(format,
 101 +          boost::algorithm::replace_all(local_format,
 102                                          fractional_seconds_or_none_format,
 103                                          replace_string);
 104          }
 105          else {
 106 -          boost::algorithm::erase_all(format,
 107 +          boost::algorithm::erase_all(local_format,
 108                                        fractional_seconds_or_none_format);
 109          }
 110        }
 111
 112        return this->do_put_tm(next_arg, ios_arg, fill_arg,
 113 -                       to_tm(time_dur_arg), format);
 114 +                       to_tm(time_dur_arg), local_format);
 115      }
 116
 117      OutItrT put(OutItrT next, std::ios_base& ios_arg,