diff options
| author | Thomas Miller <thomaslmiller91@gmail.com> | 2018-09-19 10:53:16 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-09-25 22:13:59 +0000 |
| commit | 4d40f09a45202dff901d4f970a6a7e939797138b (patch) | |
| tree | bbb553289dc85a09d4e5e9f99dbd958fc4d0eda4 /src/3rdparty/double-conversion/ieee.h | |
| parent | 42c545faf7873dc7f3f9447441d648a4451d35ef (diff) | |
Upgrade double-conversion to v3.1.1
Utils.h now includes defines for _M_ARM and _M_ARM64 to enable
compilation on Windows arm and arm64.
The locally added __ghs and __EMSCRIPTEN__ clauses are preserved.
[ChangeLog][Third-Party Code] double-conversion got updated to upstream
version 3.1.1.
Task-number: QTBUG-70008
Change-Id: Ie5411ee8d9cb32c39d7dca5a2262e6b3854732a5
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/3rdparty/double-conversion/ieee.h')
| -rw-r--r-- | src/3rdparty/double-conversion/ieee.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h index b14cf4f717..baaeced31c 100644 --- a/src/3rdparty/double-conversion/ieee.h +++ b/src/3rdparty/double-conversion/ieee.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_H_ #define DOUBLE_CONVERSION_DOUBLE_H_ -#include "diy-fp.h" +#include <double-conversion/diy-fp.h> namespace double_conversion { @@ -257,7 +257,7 @@ class Double { (biased_exponent << kPhysicalSignificandSize); } - DISALLOW_COPY_AND_ASSIGN(Double); + DC_DISALLOW_COPY_AND_ASSIGN(Double); }; class Single { @@ -394,7 +394,7 @@ class Single { const uint32_t d32_; - DISALLOW_COPY_AND_ASSIGN(Single); + DC_DISALLOW_COPY_AND_ASSIGN(Single); }; } // namespace double_conversion |