Fix compilation errors on gcc 4.6
This commit is contained in:
parent
4d35f94133
commit
0827ec5aa9
@ -232,7 +232,7 @@ typename Allocator::value_type *allocate(Allocator& alloc, std::size_t n) {
|
|||||||
#if __cplusplus >= 201103L || FMT_MSC_VER >= 1700
|
#if __cplusplus >= 201103L || FMT_MSC_VER >= 1700
|
||||||
return std::allocator_traits<Allocator>::allocate(alloc, n);
|
return std::allocator_traits<Allocator>::allocate(alloc, n);
|
||||||
#else
|
#else
|
||||||
return this->allocate(n);
|
return alloc.allocate(n);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
@ -2002,7 +2002,7 @@ class format_string_checker {
|
|||||||
public:
|
public:
|
||||||
explicit FMT_CONSTEXPR format_string_checker(
|
explicit FMT_CONSTEXPR format_string_checker(
|
||||||
basic_string_view<Char> format_str, ErrorHandler eh)
|
basic_string_view<Char> format_str, ErrorHandler eh)
|
||||||
: context_(format_str, eh) {}
|
: arg_id_(-1), context_(format_str, eh) {}
|
||||||
|
|
||||||
FMT_CONSTEXPR void on_text(const Char *, const Char *) {}
|
FMT_CONSTEXPR void on_text(const Char *, const Char *) {}
|
||||||
|
|
||||||
@ -2041,7 +2041,7 @@ class format_string_checker {
|
|||||||
// Format specifier parsing function.
|
// Format specifier parsing function.
|
||||||
typedef const Char *(*parse_func)(parse_context_type &);
|
typedef const Char *(*parse_func)(parse_context_type &);
|
||||||
|
|
||||||
int arg_id_ = -1;
|
int arg_id_;
|
||||||
parse_context_type context_;
|
parse_context_type context_;
|
||||||
parse_func parse_funcs_[NUM_ARGS > 0 ? NUM_ARGS : 1] = {
|
parse_func parse_funcs_[NUM_ARGS > 0 ? NUM_ARGS : 1] = {
|
||||||
&parse_format_specs<Args, parse_context_type>...
|
&parse_format_specs<Args, parse_context_type>...
|
||||||
|
Loading…
Reference in New Issue
Block a user