mirror of
https://github.com/gabime/spdlog.git
synced 2025-02-04 19:56:46 +08:00
Fix issue #64 (clang build fails due to details/format.h
diagnostic pop without prior push)
This commit is contained in:
parent
3556c87a51
commit
6fe03c7780
@ -102,6 +102,7 @@ inline uint32_t clzll(uint64_t x) {
|
||||
#endif
|
||||
|
||||
#ifdef __clang__
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wdocumentation"
|
||||
#endif
|
||||
|
||||
@ -174,7 +175,6 @@ inline uint32_t clzll(uint64_t x) {
|
||||
#endif
|
||||
|
||||
namespace fmt {
|
||||
|
||||
// Fix the warning about long long on older versions of GCC
|
||||
// that don't support the diagnostic pragma.
|
||||
FMT_GCC_EXTENSION typedef long long LongLong;
|
||||
@ -288,7 +288,6 @@ public:
|
||||
};
|
||||
|
||||
namespace internal {
|
||||
|
||||
// The number of characters to store in the MemoryBuffer object itself
|
||||
// to avoid dynamic memory allocation.
|
||||
enum { INLINE_BUFFER_SIZE = 500 };
|
||||
@ -379,7 +378,7 @@ void Buffer<T>::append(const T *begin, const T *end) {
|
||||
// A memory buffer for POD types with the first SIZE elements stored in
|
||||
// the object itself.
|
||||
template <typename T, std::size_t SIZE, typename Allocator = std::allocator<T> >
|
||||
class MemoryBuffer : private Allocator, public Buffer<T> {
|
||||
class MemoryBuffer : private Allocator, public Buffer < T > {
|
||||
private:
|
||||
T data_[SIZE];
|
||||
|
||||
@ -516,7 +515,7 @@ template <typename Char>
|
||||
class CharTraits;
|
||||
|
||||
template <>
|
||||
class CharTraits<char> : public BasicCharTraits<char> {
|
||||
class CharTraits<char> : public BasicCharTraits < char > {
|
||||
private:
|
||||
// Conversion from wchar_t to char is not allowed.
|
||||
static char convert(wchar_t);
|
||||
@ -533,7 +532,7 @@ public:
|
||||
};
|
||||
|
||||
template <>
|
||||
class CharTraits<wchar_t> : public BasicCharTraits<wchar_t> {
|
||||
class CharTraits<wchar_t> : public BasicCharTraits < wchar_t > {
|
||||
public:
|
||||
static wchar_t convert(char value) {
|
||||
return value;
|
||||
@ -557,7 +556,7 @@ struct SignChecker {
|
||||
};
|
||||
|
||||
template <>
|
||||
struct SignChecker<false> {
|
||||
struct SignChecker < false > {
|
||||
template <typename T>
|
||||
static bool is_negative(T) {
|
||||
return false;
|
||||
@ -578,7 +577,7 @@ struct TypeSelector {
|
||||
};
|
||||
|
||||
template <>
|
||||
struct TypeSelector<false> {
|
||||
struct TypeSelector < false > {
|
||||
typedef uint64_t Type;
|
||||
};
|
||||
|
||||
@ -754,7 +753,7 @@ struct NonZero {
|
||||
};
|
||||
|
||||
template <>
|
||||
struct NonZero<0> {
|
||||
struct NonZero < 0 > {
|
||||
enum { VALUE = 1 };
|
||||
};
|
||||
|
||||
@ -815,7 +814,7 @@ struct WCharHelper {
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
struct WCharHelper<T, wchar_t> {
|
||||
struct WCharHelper < T, wchar_t > {
|
||||
typedef T Supported;
|
||||
typedef None<T> Unsupported;
|
||||
};
|
||||
@ -943,7 +942,7 @@ public:
|
||||
template <typename T>
|
||||
MakeValue(const T &value) {
|
||||
custom.value = &value;
|
||||
custom.format = &format_custom_arg<T>;
|
||||
custom.format = &format_custom_arg < T > ;
|
||||
}
|
||||
template <typename T>
|
||||
static uint64_t type(const T &) {
|
||||
@ -1111,7 +1110,6 @@ public:
|
||||
struct FormatSpec;
|
||||
|
||||
namespace internal {
|
||||
|
||||
class FormatterBase {
|
||||
private:
|
||||
ArgList args_;
|
||||
@ -1740,8 +1738,8 @@ private:
|
||||
template<typename T>
|
||||
void append_float_length(Char *&, T) {}
|
||||
|
||||
friend class internal::ArgFormatter<Char>;
|
||||
friend class internal::PrintfFormatter<Char>;
|
||||
friend class internal::ArgFormatter < Char > ;
|
||||
friend class internal::PrintfFormatter < Char > ;
|
||||
|
||||
protected:
|
||||
/**
|
||||
@ -2283,7 +2281,7 @@ accessed as a C string with ``out.c_str()``.
|
||||
\endrst
|
||||
*/
|
||||
template <typename Char, typename Allocator = std::allocator<Char> >
|
||||
class BasicMemoryWriter : public BasicWriter<Char> {
|
||||
class BasicMemoryWriter : public BasicWriter < Char > {
|
||||
private:
|
||||
internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE, Allocator> buffer_;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user