summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-10-31 13:49:57 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-10-31 15:56:08 +0100
commit37b4c07c705d068d00863ee0373322f8a94cb06e (patch)
treed1182412ea061049900d000aab57226ad3d3bdec /src/3rdparty
parent0ae489053a9fafeb45f6de4431ed7b7ea992b8f8 (diff)
3rd-Party/Double conversion: Fix developer build with MSVC
Re-apply 72e3d3633e4aca6742a124fb29584d46b63f40ff, which was omitted in 425df43d7fed19866fc7ceb3d26b6cc4190523f5. Task-number: QTBUG-79418 Change-Id: I0afa9ff9ace5bdc6cea103cf2acba6dbf9a64a72 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/double-conversion/double-conversion.cc5
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() {