From 9cc24166b52266509cf8dc1f9edc2d283bfbc096 Mon Sep 17 00:00:00 2001 From: Gregory Czajkowski Date: Tue, 12 Nov 2013 14:12:17 -0800 Subject: [PATCH] revert back changes and to create a single pull request for bin mode --- format.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/format.h b/format.h index cdfaec0a..cd655ec9 100644 --- a/format.h +++ b/format.h @@ -56,11 +56,9 @@ #endif #ifdef __GNUC__ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wlong-long" #endif -#endif namespace fmt { @@ -451,7 +449,6 @@ DEFINE_INT_FORMATTERS(int) DEFINE_INT_FORMATTERS(long) DEFINE_INT_FORMATTERS(unsigned) DEFINE_INT_FORMATTERS(unsigned long) -DEFINE_INT_FORMATTERS(unsigned long long) template class BasicFormatter; @@ -492,7 +489,7 @@ class BasicFormatter; template class BasicWriter { private: - enum { INLINE_BUFFER_SIZE = 512 }; + enum { INLINE_BUFFER_SIZE = 500 }; mutable internal::Array buffer_; // Output buffer. friend class BasicFormatter; @@ -1187,7 +1184,6 @@ class FormatInt { *--str_ = '-'; } explicit FormatInt(unsigned value) : str_(FormatDecimal(value)) {} - explicit FormatInt(uint64_t value) : str_(FormatDecimal(value)) {} inline const char *c_str() const { return str_; } inline std::string str() const { return str_; } @@ -1240,9 +1236,7 @@ inline Formatter Print(StringRef format) { } #ifdef __GNUC__ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) # pragma GCC diagnostic pop #endif -#endif #endif // FORMAT_H_