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 | 5141360099158b35eee1e9287d2dbc2ac5e808ab (patch) | |
| tree | b97551ddc680260bf392b017114adb9bd4e4b2b2 /src | |
| parent | b9ad49844b50b57156bc113b9a4d8cb23bcc6d74 (diff) | |
| parent | d068f3359f86f5f0d5df693e8e0377d0d45540d4 (diff) | |
| download | tor-5141360099158b35eee1e9287d2dbc2ac5e808ab.tar.gz tor-5141360099158b35eee1e9287d2dbc2ac5e808ab.zip | |
Merge branch 'maint-0.3.1'
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 f53a99533b..5b47028097 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5608,6 +5608,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; @@ -5633,6 +5645,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 |