3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 16:41:04 +08:00
Code Issues Projects Releases Wiki Activity

Silence shadow warnings

Browse Source
This commit is contained in:
Howard Hinnant 2018-07-01 22:37:25 -04:00
parent de6a03d337
commit 39d6730665
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/date/date.h
View File

@ -6471,14 +6471,14 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
{ {
if (modified == CharT{}) if (modified == CharT{})
{ {
int tm = not_a_month; int tn = not_a_month;
int td = not_a_day; int td = not_a_day;
int ty = not_a_2digit_year; int ty = not_a_2digit_year;
read(is, ru{tm, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'}, read(is, ru{tn, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'},
ru{td, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'}, ru{td, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'},
rs{ty, 1, 2}); rs{ty, 1, 2});
checked_set(y, ty, not_a_2digit_year, is); checked_set(y, ty, not_a_2digit_year, is);
checked_set(m, tm, not_a_month, is); checked_set(m, tn, not_a_month, is);
checked_set(d, td, not_a_day, is); checked_set(d, td, not_a_day, is);
} }
else else
@ -6496,12 +6496,12 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
if (modified == CharT{}) if (modified == CharT{})
{ {
int tY = not_a_year; int tY = not_a_year;
int tm = not_a_month; int tn = not_a_month;
int td = not_a_day; int td = not_a_day;
read(is, rs{tY, 1, width == -1 ? 4u : static_cast<unsigned>(width)}, read(is, rs{tY, 1, width == -1 ? 4u : static_cast<unsigned>(width)},
CharT{'-'}, ru{tm, 1, 2}, CharT{'-'}, ru{td, 1, 2}); CharT{'-'}, ru{tn, 1, 2}, CharT{'-'}, ru{td, 1, 2});
checked_set(Y, tY, not_a_year, is); checked_set(Y, tY, not_a_year, is);
checked_set(m, tm, not_a_month, is); checked_set(m, tn, not_a_month, is);
checked_set(d, td, not_a_day, is); checked_set(d, td, not_a_day, is);
} }
else else
@ -6661,9 +6661,9 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
if (modified != CharT{'E'}) if (modified != CharT{'E'})
#endif #endif
{ {
int tm = not_a_month; int tn = not_a_month;
read(is, rs{tm, 1, width == -1 ? 2u : static_cast<unsigned>(width)}); read(is, rs{tn, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
checked_set(m, tm, not_a_month, is); checked_set(m, tn, not_a_month, is);
} }
#if !ONLY_C_LOCALE #if !ONLY_C_LOCALE
else if (modified == CharT{'O'}) else if (modified == CharT{'O'})