External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove FMT_OVERRIDE

Browse Source
This commit is contained in:
Victor Zverovich 2021-09-03 18:15:17 -07:00
parent 42a225cbd9
commit a151f955a0
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fmt/core.h
View File

@ -117,15 +117,6 @@
# define FMT_CONSTEXPR_CHAR_TRAITS # define FMT_CONSTEXPR_CHAR_TRAITS
#endif #endif
#ifndef FMT_OVERRIDE
# if FMT_HAS_FEATURE(cxx_override_control) || FMT_GCC_VERSION >= 408 || \
FMT_MSC_VER >= 1900
# define FMT_OVERRIDE override
# else
# define FMT_OVERRIDE
# endif
#endif
// Check if exceptions are disabled. // Check if exceptions are disabled.
#ifndef FMT_EXCEPTIONS #ifndef FMT_EXCEPTIONS
# if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \ # if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \
@ -861,7 +852,7 @@ class iterator_buffer final : public Traits, public buffer<T> {
T data_[buffer_size]; T data_[buffer_size];
protected: protected:
void grow(size_t) FMT_OVERRIDE { void grow(size_t) override {
if (this->size() == buffer_size) flush(); if (this->size() == buffer_size) flush();
} }
@ -887,7 +878,7 @@ class iterator_buffer final : public Traits, public buffer<T> {
template <typename T> class iterator_buffer<T*, T> final : public buffer<T> { template <typename T> class iterator_buffer<T*, T> final : public buffer<T> {
protected: protected:
void grow(size_t) FMT_OVERRIDE {} void grow(size_t) override {}
public: public:
explicit iterator_buffer(T* out, size_t = 0) : buffer<T>(out, 0, ~size_t()) {} explicit iterator_buffer(T* out, size_t = 0) : buffer<T>(out, 0, ~size_t()) {}
@ -905,7 +896,7 @@ class iterator_buffer<std::back_insert_iterator<Container>,
Container& container_; Container& container_;
protected: protected:
void grow(size_t capacity) FMT_OVERRIDE { void grow(size_t capacity) override {
container_.resize(capacity); container_.resize(capacity);
this->set(&container_[0], capacity); this->set(&container_[0], capacity);
} }
@ -928,7 +919,7 @@ template <typename T = char> class counting_buffer final : public buffer<T> {
size_t count_ = 0; size_t count_ = 0;
protected: protected:
void grow(size_t) FMT_OVERRIDE { void grow(size_t) override {
if (this->size() != buffer_size) return; if (this->size() != buffer_size) return;
count_ += this->size(); count_ += this->size();
this->clear(); this->clear();

4
include/fmt/format.h
View File

@ -657,7 +657,7 @@ class basic_memory_buffer final : public detail::buffer<T> {
} }
protected: protected:
void grow(size_t size) FMT_OVERRIDE; void grow(size_t size) override;
public: public:
using value_type = T; using value_type = T;
@ -788,7 +788,7 @@ class FMT_API format_error : public std::runtime_error {
format_error& operator=(const format_error&) = default; format_error& operator=(const format_error&) = default;
format_error(format_error&&) = default; format_error(format_error&&) = default;
format_error& operator=(format_error&&) = default; format_error& operator=(format_error&&) = default;
~format_error() FMT_NOEXCEPT FMT_OVERRIDE FMT_MSC_DEFAULT; ~format_error() FMT_NOEXCEPT override FMT_MSC_DEFAULT;
}; };
/** /**