feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Fix the build.

Browse Source
This commit is contained in:
Victor Zverovich
2013-01-13 09:29:37 -08:00
parent 41d898e1e4
commit 2ca696d4df
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
format.h
View File

@@ -124,14 +124,12 @@ struct IntTraits {};
template <typename T, typename UnsignedT> template <typename T, typename UnsignedT>
struct SignedIntTraits { struct SignedIntTraits {
typedef T Type;
typedef UnsignedT UnsignedType; typedef UnsignedT UnsignedType;
static bool IsNegative(T value) { return value < 0; } static bool IsNegative(T value) { return value < 0; }
}; };
template <typename T> template <typename T>
struct UnsignedIntTraits { struct UnsignedIntTraits {
typedef T Type;
typedef T UnsignedType; typedef T UnsignedType;
static bool IsNegative(T) { return false; } static bool IsNegative(T) { return false; }
}; };
@@ -143,10 +141,10 @@ template <>
struct IntTraits<unsigned> : UnsignedIntTraits<unsigned> {}; struct IntTraits<unsigned> : UnsignedIntTraits<unsigned> {};
template <> template <>
struct IntTraits<int64_t> : SignedIntTraits<int64_t, uint64_t> {}; struct IntTraits<long> : SignedIntTraits<long, unsigned long> {};
template <> template <>
struct IntTraits<uint64_t> : UnsignedIntTraits<uint64_t> {}; struct IntTraits<unsigned long> : UnsignedIntTraits<unsigned long> {};
class ArgInserter; class ArgInserter;
class FormatterProxy; class FormatterProxy;
@@ -288,42 +286,38 @@ class IntFormatter : public SpecT {
T value() const { return value_; } T value() const { return value_; }
}; };
// Returns an integer formatter that formats value in the octal base. #define DEFINE_INT_FORMATTERS(TYPE) \
// internal::IntTraits<T>::Type is used instead of T to avoid instantiating /* Returns an integer formatter that formats value in the octal base. */ \
// the function for types smaller than int similarly to enable_if. inline IntFormatter<TYPE, TypeSpec<'o'> > oct(TYPE value) { \
template <typename T> return IntFormatter<TYPE, TypeSpec<'o'> >(value, TypeSpec<'o'>()); \
inline IntFormatter< } \
typename internal::IntTraits<T>::Type, TypeSpec<'o'> > oct(T value) { \
return IntFormatter<T, TypeSpec<'o'> >(value, TypeSpec<'o'>()); inline IntFormatter<TYPE, TypeSpec<'x'> > hex(TYPE value) { \
return IntFormatter<TYPE, TypeSpec<'x'> >(value, TypeSpec<'x'>()); \
} \
\
inline IntFormatter<TYPE, TypeSpec<'X'> > hexu(TYPE value) { \
return IntFormatter<TYPE, TypeSpec<'X'> >(value, TypeSpec<'X'>()); \
} \
\
template <char TYPE_CODE> \
inline IntFormatter<TYPE, AlignTypeSpec<TYPE_CODE> > pad( \
IntFormatter<TYPE, TypeSpec<TYPE_CODE> > f, \
unsigned width, char fill = ' ') { \
return IntFormatter<TYPE, AlignTypeSpec<TYPE_CODE> >( \
f.value(), AlignTypeSpec<TYPE_CODE>(width, fill)); \
} \
\
inline IntFormatter<TYPE, AlignTypeSpec<0> > pad( \
TYPE value, unsigned width, char fill = ' ') { \
return IntFormatter<TYPE, AlignTypeSpec<0> >( \
value, AlignTypeSpec<0>(width, fill)); \
} }
template <typename T> DEFINE_INT_FORMATTERS(int)
inline IntFormatter< DEFINE_INT_FORMATTERS(long)
typename internal::IntTraits<T>::Type, TypeSpec<'x'> > hex(T value) { DEFINE_INT_FORMATTERS(unsigned)
return IntFormatter<T, TypeSpec<'x'> >(value, TypeSpec<'x'>()); DEFINE_INT_FORMATTERS(unsigned long)
}
template <typename T>
inline IntFormatter<
typename internal::IntTraits<T>::Type, TypeSpec<'X'> > hexu(T value) {
return IntFormatter<T, TypeSpec<'X'> >(value, TypeSpec<'X'>());
}
template <typename T, char TYPE>
inline IntFormatter<
typename internal::IntTraits<T>::Type, AlignTypeSpec<TYPE> > pad(
IntFormatter<T, TypeSpec<TYPE> > f, unsigned width, char fill = ' ') {
return IntFormatter<T, AlignTypeSpec<TYPE> >(
f.value(), AlignTypeSpec<TYPE>(width, fill));
}
template <typename T>
inline IntFormatter<
typename internal::IntTraits<T>::Type, AlignTypeSpec<0> > pad(
T value, unsigned width, char fill = ' ') {
return IntFormatter<T, AlignTypeSpec<0> >(
value, AlignTypeSpec<0>(width, fill));
}
class BasicFormatter { class BasicFormatter {
private: private:
@@ -570,8 +564,8 @@ class Formatter : public BasicFormatter {
int int_value; int int_value;
unsigned uint_value; unsigned uint_value;
double double_value; double double_value;
int64_t long_value; long long_value;
uint64_t ulong_value; unsigned long ulong_value;
long double long_double_value; long double long_double_value;
const void *pointer_value; const void *pointer_value;
struct { struct {

7
format_test.cc
View File

@@ -1065,10 +1065,11 @@ TEST(TempFormatterTest, Examples) {
} }
TEST(StrTest, oct) { TEST(StrTest, oct) {
EXPECT_EQ("12", (BasicFormatter() << oct(static_cast<short>(012))).str());
EXPECT_EQ("12", (BasicFormatter() << oct(012)).str()); EXPECT_EQ("12", (BasicFormatter() << oct(012)).str());
EXPECT_EQ("34", (BasicFormatter() << oct(034)).str()); EXPECT_EQ("34", (BasicFormatter() << oct(034u)).str());
EXPECT_EQ("56", (BasicFormatter() << oct(056)).str()); EXPECT_EQ("56", (BasicFormatter() << oct(056l)).str());
EXPECT_EQ("70", (BasicFormatter() << oct(070)).str()); EXPECT_EQ("70", (BasicFormatter() << oct(070ul)).str());
} }
TEST(StrTest, hex) { TEST(StrTest, hex) {