diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-26 12:53:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-26 12:53:13 -0400 |
| commit | 6d3c5b8fb5784240232a9265049b9e1660270df7 (patch) | |
| tree | 5276f285f409a4c158bb76edf7f7f83e393c0d95 /src | |
| parent | 3a7d757140c344986fba5769b47dc10d925fe119 (diff) | |
| parent | fca1934c88f1238a43d0bea5b06cea4fd15e7b93 (diff) | |
| download | tor-6d3c5b8fb5784240232a9265049b9e1660270df7.tar.gz tor-6d3c5b8fb5784240232a9265049b9e1660270df7.zip | |
Merge branch 'bug22915_029_2' into maint-0.2.9
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 9e61eb7710..d2cbacde31 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5705,6 +5705,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; @@ -5730,6 +5742,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 |