diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-26 12:53:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-26 12:53:38 -0400 |
| commit | 3c017e823bdcfeea4316755b208fa2bf9df5fb00 (patch) | |
| tree | 8c27722f4539664d43480f3fc7967b4992372e53 /src | |
| parent | f5d2f79acafc0cb7698442aec3323b2abe802e37 (diff) | |
| parent | 6d3c5b8fb5784240232a9265049b9e1660270df7 (diff) | |
| download | tor-3c017e823bdcfeea4316755b208fa2bf9df5fb00.tar.gz tor-3c017e823bdcfeea4316755b208fa2bf9df5fb00.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/util.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c index a2c3dc7550..4942ee3a9e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5744,6 +5744,18 @@ clamp_double_to_int64(double number) #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif + +/* + With clang 4.0 we apparently run into "double promotion" warnings here, + since clang thinks we're promoting a double to a long double. + */ +#if defined(__clang__) +#if __has_warning("-Wdouble-promotion") +#define PROBLEMATIC_DOUBLE_PROMOTION_WARNING +DISABLE_GCC_WARNING(double-promotion) +#endif +#endif + /* NaN is a special case that can't be used with the logic below. */ if (isnan(number)) { return 0; @@ -5769,6 +5781,10 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; + +#ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING +ENABLE_GCC_WARNING(double-promotion) +#endif #ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif |