Commit Graph

60 Commits

Author SHA1 Message Date
Magnus Bjerke Vik
0bed09caaf Fix Android not being detected with latest NDK toolchain (#458)
When using the NDK 13b toolchain standalone or with CMake, ANDROID is not defined,
but __ANDROID__ is defined instead.

(cherry picked from commit bc6af7548b)
2017-06-08 11:29:36 +02:00
Victor Zverovich
0e5a4422c2 Workaround an nvcc bug
(cherry picked from commit 9e9ad57f58)
2017-06-08 11:29:32 +02:00
Calum Robinson
72484cc191 Fix missing intrinsic when included from C++/CLI
Managed C++ code doesn't have the _BitScanReverse* intrinsics, we must use the fallback code for count_digits etc.

(cherry picked from commit a2596d685d)
2017-06-08 11:29:27 +02:00
Eric Fiselier
80bfa855a2 Don't export the -std=c++11 flag from the fmt target
(cherry picked from commit b9aaa507fc)
2017-06-08 11:29:16 +02:00
Victor Zverovich
a55df13598 Fix collision with global convert function (#425)
(cherry picked from commit 796beaaddb)
2017-06-08 11:28:43 +02:00
Victor Zverovich
baedba07ca Fix signbit detection (#423)
(cherry picked from commit def687462c)
2017-06-08 11:28:39 +02:00
Victor Zverovich
b9a20d761a Add version macro FMT_VERSION (#411)
(cherry picked from commit f5b1c16e2c)

# Conflicts:
#	CMakeLists.txt
2017-06-08 11:27:51 +02:00
Victor Zverovich
ba0c3b957f Fix warnings on C++98
(cherry picked from commit cfd00af37a)
2017-06-08 11:27:11 +02:00
Chen Hayat
abee8f95ec Fix Klockwork compilation warning
(cherry picked from commit 05ba3e7888)
2017-06-08 11:23:04 +02:00
Victor Zverovich
48ba0f2aa2 FMT_NULLPTR -> FMT_NULL and improve formatting
(cherry picked from commit 1daddec151)

# Conflicts:
#	fmt/printf.h
#	fmt/string.h
#	fmt/time.h
2017-06-08 11:22:50 +02:00
Jonathan Müller
d3a9d03138 Fix missing '>'
(cherry picked from commit d8867a2b07)
2017-06-08 11:21:55 +02:00
Jonathan Müller
7aaa693fb3 Add extern templates for format_float
Fixes #413.

(cherry picked from commit 6c0125785b)
2017-06-08 11:21:49 +02:00
alabuzhev
267bed868f Using FMT_NULLPTR instead of literal 0
(cherry picked from commit 49ccb2e449)
2017-06-08 11:21:41 +02:00
Lectem
5a5c3a3c25 fix newer clang warnings
(cherry picked from commit 8f455c10b0)
2017-06-08 11:17:45 +02:00
Jan Hellwig
63639cba98 Fix Windows compilation with -fno-exceptions (#405)
(cherry picked from commit 15d0f32773)
2016-10-31 22:02:42 +01:00
Jan Hellwig
2baf2a5e2c Fix Linux compilation with -fno-exceptions (#402)
(cherry picked from commit 8c63ea432c)
2016-10-31 22:02:42 +01:00
Victor Zverovich
fb9015b3a1 CHAR_WIDTH -> CHAR_SIZE to avoid collision with ISO/IEC TS 18661-1:2014 macro
(cherry picked from commit abbefd7166)
2016-10-28 19:42:17 +02:00
chronoxor
0a0c2c9cdd Remove unnecessary "fmt/" prefix which should be maintained with additional include_directories() in each project. (#397)
(cherry picked from commit 1500f00525)
2016-10-23 12:17:31 +02:00
Victor Zverovich
1c9a674d24 Fix compilation on Cygwin (#388)
(cherry picked from commit cee50b7572)
2016-10-23 12:17:30 +02:00
Jean-Michaël Celerier
6e6adf431f Add FMT_OVERRIDE macro to allow specifying overriding functions in c++11 compilers
(cherry picked from commit 9ec3bea2d6)
2016-10-23 12:17:30 +02:00
Hugh Wang
f8289ba1da Fix compilation on Android.
(cherry picked from commit 5f26b5da28)
2016-10-23 12:17:30 +02:00
Victor Zverovich
f4a417f8fb Fix handling of unsigned char strings (#373)
(cherry picked from commit a79c7b4e8f)
2016-10-23 12:17:30 +02:00
Victor Zverovich
f0a0674040 Use a heuristic to detect empty strftime result (#367)
(cherry picked from commit a5d0adf395)
2016-10-23 12:01:33 +02:00
Victor Zverovich
c79174e1c0 Correct buffer growth when formatting time (#367)
(cherry picked from commit 1a23f9c274)
2016-10-23 12:01:17 +02:00
Nils Moehrle
e3de93298b Remove unreachable code below FMT_THROW
(cherry picked from commit c8c9973669)
2016-10-23 11:58:44 +02:00
Victor Zverovich
a20c81a061 Break a long line
(cherry picked from commit 903357c853)
2016-10-23 11:53:12 +02:00
Tilman Keskinöz
5d306cf11c Fix compile on freebsd
(cherry picked from commit d7c4e1cb1f)
2016-10-23 11:53:00 +02:00
Victor Zverovich
3f778b2099 check -> const_check to avoid a conflict with AssertMacros.h (#350)
(cherry picked from commit 8631694021)
2016-10-23 11:52:49 +02:00
Victor Zverovich
27f604a153 Fix handling of thousands separator (#353)
(cherry picked from commit 0e6df7e511)
2016-10-23 11:52:39 +02:00
Sean LK
1127e7a953 Fix building with clang in header-only mode
Building under a recent clang compiler causes the use of an extern
template for the BasicData struct. However, the only instantiation of
that structure in format.cc is only done if FMT_HEADER_ONLY is not
defined. This causes the build to fail in C++11 or C++14 mode.
Therefore, only declare the BasicData template as extern if
FMT_HEADER_ONLY is not defined.

(cherry picked from commit 75f862bf57)
2016-10-23 11:52:28 +02:00
Victor Zverovich
b838eb0c2e Reduce noise
(cherry picked from commit 5c876088d3)
2016-10-23 11:52:07 +02:00
Victor Zverovich
b26e239c05 Fix MSVC warnings
(cherry picked from commit e0d6f630f8)
2016-10-23 11:51:09 +02:00
Victor Zverovich
300d4f3c89 Suppress -Wpadded warnings
(cherry picked from commit a201c61977)
2016-10-23 11:50:15 +02:00
Victor Zverovich
92d3f31df5 Fix clang warning
(cherry picked from commit c9bb5468b6)
2016-10-23 11:49:54 +02:00
Victor Zverovich
df05947b8a Fix a -Wweak-vtables warning in clang
(cherry picked from commit b26e76efe9)
2016-10-23 11:49:44 +02:00
Victor Zverovich
679fed9187 Don't use strtod_l on Android (#345)
(cherry picked from commit c7739536e8)
2016-10-23 11:49:31 +02:00
Victor Zverovich
14b4a2b073 Suppress clang's documentation warnings
(cherry picked from commit 18e3f16576)
2016-10-23 11:49:19 +02:00
Victor Zverovich
8bb431fef3 Break long lines
(cherry picked from commit 231c16df25)
2016-10-23 11:47:59 +02:00
Victor Zverovich
ae85c91e80 Detect if lconv contains thousands_sep
(cherry picked from commit 96c28f748d)
2016-10-23 11:47:15 +02:00
Victor Zverovich
584fa85d18 Add fmt prefix to includes (#332)
Technically it is not necessary, but prevents errors when people add the
fmt directory itself rather than its parent to includes.

(cherry picked from commit e160c2b79a)
2016-10-23 11:46:38 +02:00
Victor Zverovich
078c44e31c Improve formatting consistency
(cherry picked from commit ebff26f8f1)
2016-10-23 11:44:52 +02:00
Dmitry Panteleev
2fd6c0b245 Workaround for missing lconv support in android (#327)
(cherry picked from commit 45a1509455)
2016-10-23 11:44:42 +02:00
Victor Zverovich
5b26ada01c Fix clang -Weverything warnings (#250)
(cherry picked from commit 3400e0d609)
2016-10-23 11:44:02 +02:00
Victor Zverovich
3f1cd52adc Fix a clang warning about an undefined template (#318)
(cherry picked from commit 744c2824c5)
2016-10-23 11:42:09 +02:00
Victor Zverovich
9c865560fd Fix a warning 2016-05-07 07:10:40 -07:00
Victor Zverovich
1788883262 Fix warnings 2016-05-07 07:03:21 -07:00
Victor Zverovich
90730e706b Move ostream support to ostream.{h,cc} 2016-05-06 07:37:20 -07:00
Victor Zverovich
c5fe3eb87e Fix code bloat regression on gcc 5.3.1 with -std=c++11 (#315) 2016-05-05 07:48:06 -07:00
Victor Zverovich
408c84cd42 Update copyright (#314) 2016-05-04 06:27:03 -07:00
Dean Moldovan
729491eab7 Use FMT_ICC_VERSION everywhere internally 2016-05-03 14:26:01 +02:00