diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:00:44 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:00:45 +0100 |
commit | 7a13a091161851b7fa38d838d3c6ef3a96e19422 (patch) | |
tree | f8902e9b8dca7f10c519de9a90919d34fc34240b /src/3rdparty | |
parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) | |
parent | 37b4c07c705d068d00863ee0373322f8a94cb06e (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic13ef00d76c81295076bb2432576db70ec84fe29
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/double-conversion/double-conversion.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc index 9cf13bdbf7..8c52755cfb 100644 --- a/src/3rdparty/double-conversion/double-conversion.cc +++ b/src/3rdparty/double-conversion/double-conversion.cc @@ -38,6 +38,11 @@ #include <double-conversion/strtod.h> #include <double-conversion/utils.h> +// Fix warning C4244: 'argument': conversion from 'const uc16' to 'char', possible loss of data +#ifdef _MSC_VER + __pragma(warning(disable: 4244)) +#endif + namespace double_conversion { const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() { |