AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-01-10 14:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #385 from jcelerier/master

Browse Source 
Add FMT_OVERRIDE macro to allow specifying overriding functions
This commit is contained in:
Victor Zverovich 2016-09-25 07:44:37 -07:00 committed by GitHub
commit 64a0016680
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fmt/format.h
View File

@ -194,6 +194,17 @@ typedef __int64 intmax_t;
# endif # endif
#endif #endif
#ifndef FMT_OVERRIDE
# if FMT_USE_OVERRIDE || FMT_HAS_FEATURE(cxx_override) || \
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \
FMT_MSC_VER >= 1900
# define FMT_OVERRIDE override
# else
# define FMT_OVERRIDE
# endif
#endif
// A macro to disallow the copy constructor and operator= functions // A macro to disallow the copy constructor and operator= functions
// This should be used in the private: declarations for a class // This should be used in the private: declarations for a class
#ifndef FMT_USE_DELETED_FUNCTIONS #ifndef FMT_USE_DELETED_FUNCTIONS
@ -678,7 +689,7 @@ class MemoryBuffer : private Allocator, public Buffer<T> {
} }
protected: protected:
void grow(std::size_t size); void grow(std::size_t size) FMT_OVERRIDE;
public: public:
explicit MemoryBuffer(const Allocator &alloc = Allocator()) explicit MemoryBuffer(const Allocator &alloc = Allocator())