Commit 9cc24166 authored by Gregory Czajkowski's avatar Gregory Czajkowski

revert back changes and to create a single pull request for bin mode

parent c5695691
...@@ -56,11 +56,9 @@ ...@@ -56,11 +56,9 @@
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wlong-long" # pragma GCC diagnostic ignored "-Wlong-long"
#endif #endif
#endif
namespace fmt { namespace fmt {
...@@ -451,7 +449,6 @@ DEFINE_INT_FORMATTERS(int) ...@@ -451,7 +449,6 @@ DEFINE_INT_FORMATTERS(int)
DEFINE_INT_FORMATTERS(long) DEFINE_INT_FORMATTERS(long)
DEFINE_INT_FORMATTERS(unsigned) DEFINE_INT_FORMATTERS(unsigned)
DEFINE_INT_FORMATTERS(unsigned long) DEFINE_INT_FORMATTERS(unsigned long)
DEFINE_INT_FORMATTERS(unsigned long long)
template <typename Char> template <typename Char>
class BasicFormatter; class BasicFormatter;
...@@ -492,7 +489,7 @@ class BasicFormatter; ...@@ -492,7 +489,7 @@ class BasicFormatter;
template <typename Char> template <typename Char>
class BasicWriter { class BasicWriter {
private: private:
enum { INLINE_BUFFER_SIZE = 512 }; enum { INLINE_BUFFER_SIZE = 500 };
mutable internal::Array<Char, INLINE_BUFFER_SIZE> buffer_; // Output buffer. mutable internal::Array<Char, INLINE_BUFFER_SIZE> buffer_; // Output buffer.
friend class BasicFormatter<Char>; friend class BasicFormatter<Char>;
...@@ -1187,7 +1184,6 @@ class FormatInt { ...@@ -1187,7 +1184,6 @@ class FormatInt {
*--str_ = '-'; *--str_ = '-';
} }
explicit FormatInt(unsigned value) : str_(FormatDecimal(value)) {} explicit FormatInt(unsigned value) : str_(FormatDecimal(value)) {}
explicit FormatInt(uint64_t value) : str_(FormatDecimal(value)) {}
inline const char *c_str() const { return str_; } inline const char *c_str() const { return str_; }
inline std::string str() const { return str_; } inline std::string str() const { return str_; }
...@@ -1240,9 +1236,7 @@ inline Formatter<Write> Print(StringRef format) { ...@@ -1240,9 +1236,7 @@ inline Formatter<Write> Print(StringRef format) {
} }
#ifdef __GNUC__ #ifdef __GNUC__
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
#endif
#endif // FORMAT_H_ #endif // FORMAT_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment