@@ -2103,7 +2103,7 @@ class year_month_day {
2103
2103
#endif
2104
2104
2105
2105
template <typename Char>
2106
- struct formatter <weekday, Char> : formatter<std::tm , Char> {
2106
+ struct formatter <weekday, Char> : private formatter<std::tm , Char> {
2107
2107
private:
2108
2108
bool localized_{false };
2109
2109
bool use_tm_formatter_{false };
@@ -2136,15 +2136,15 @@ struct formatter<weekday, Char> : formatter<std::tm, Char> {
2136
2136
};
2137
2137
2138
2138
template <typename Char>
2139
- struct formatter <day, Char> : formatter<std::tm , Char> {
2139
+ struct formatter <day, Char> : private formatter<std::tm , Char> {
2140
2140
private:
2141
2141
bool use_tm_formatter_{false };
2142
2142
2143
2143
public:
2144
2144
FMT_CONSTEXPR auto parse (basic_format_parse_context<Char>& ctx)
2145
2145
-> decltype(ctx.begin()) {
2146
2146
auto it = ctx.begin (), end = ctx.end ();
2147
- use_tm_formatter_ = ! (it == end || *it = = ' }' );
2147
+ use_tm_formatter_ = (it != end && *it ! = ' }' );
2148
2148
return use_tm_formatter_ ? formatter<std::tm , Char>::parse (ctx) : it;
2149
2149
}
2150
2150
@@ -2163,7 +2163,7 @@ struct formatter<day, Char> : formatter<std::tm, Char> {
2163
2163
};
2164
2164
2165
2165
template <typename Char>
2166
- struct formatter <month, Char> : formatter<std::tm , Char> {
2166
+ struct formatter <month, Char> : private formatter<std::tm , Char> {
2167
2167
private:
2168
2168
bool localized_{false };
2169
2169
bool use_tm_formatter_{false };
@@ -2196,15 +2196,15 @@ struct formatter<month, Char> : formatter<std::tm, Char> {
2196
2196
};
2197
2197
2198
2198
template <typename Char>
2199
- struct formatter <year, Char> : formatter<std::tm , Char> {
2199
+ struct formatter <year, Char> : private formatter<std::tm , Char> {
2200
2200
private:
2201
2201
bool use_tm_formatter_{false };
2202
2202
2203
2203
public:
2204
2204
FMT_CONSTEXPR auto parse (basic_format_parse_context<Char>& ctx)
2205
2205
-> decltype(ctx.begin()) {
2206
2206
auto it = ctx.begin (), end = ctx.end ();
2207
- use_tm_formatter_ = ! (it == end || *it = = ' }' );
2207
+ use_tm_formatter_ = (it != end && *it ! = ' }' );
2208
2208
return use_tm_formatter_ ? formatter<std::tm , Char>::parse (ctx) : it;
2209
2209
}
2210
2210
@@ -2223,15 +2223,15 @@ struct formatter<year, Char> : formatter<std::tm, Char> {
2223
2223
};
2224
2224
2225
2225
template <typename Char>
2226
- struct formatter <year_month_day, Char> : formatter<std::tm , Char> {
2226
+ struct formatter <year_month_day, Char> : private formatter<std::tm , Char> {
2227
2227
private:
2228
2228
bool use_tm_formatter_{false };
2229
2229
2230
2230
public:
2231
2231
FMT_CONSTEXPR auto parse (basic_format_parse_context<Char>& ctx)
2232
2232
-> decltype(ctx.begin()) {
2233
2233
auto it = ctx.begin (), end = ctx.end ();
2234
- use_tm_formatter_ = ! (it == end || *it = = ' }' );
2234
+ use_tm_formatter_ = (it != end && *it ! = ' }' );
2235
2235
return use_tm_formatter_ ? formatter<std::tm , Char>::parse (ctx) : it;
2236
2236
}
2237
2237
0 commit comments