diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-27 01:00:05 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-27 09:29:30 +0100 |
commit | 4054c0d6ed8bafe7ca68d981daf1be51a55fe6f1 (patch) | |
tree | b4e000e7db3ef633983fab4dc1957721fd904657 /src/3rdparty/double-conversion | |
parent | 3ea7caed6f949953706aaa6ce00d79aa8ca15a60 (diff) | |
parent | 25101f0984e86aa30f34773eb5b2025f58086b71 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
src/plugins/platforms/xcb/qxcbscreen.cpp
src/widgets/accessible/qaccessiblewidget.cpp
Change-Id: Ib3138e61ba7981610940509a7ff02ba2dd281bf0
Diffstat (limited to 'src/3rdparty/double-conversion')
-rw-r--r-- | src/3rdparty/double-conversion/double-conversion.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc index 8c52755cfb..148193b72a 100644 --- a/src/3rdparty/double-conversion/double-conversion.cc +++ b/src/3rdparty/double-conversion/double-conversion.cc @@ -535,22 +535,10 @@ static double SignedZero(bool sign) { // Returns true if 'c' is a decimal digit that is valid for the given radix. -// -// The function is small and could be inlined, but VS2012 emitted a warning -// because it constant-propagated the radix and concluded that the last -// condition was always true. By moving it into a separate function the -// compiler wouldn't warn anymore. -#ifdef _MSC_VER -#pragma optimize("",off) -static bool IsDecimalDigitForRadix(int c, int radix) { - return '0' <= c && c <= '9' && (c - '0') < radix; -} -#pragma optimize("",on) -#else static bool inline IsDecimalDigitForRadix(int c, int radix) { return '0' <= c && c <= '9' && (c - '0') < radix; } -#endif + // Returns true if 'c' is a character digit that is valid for the given radix. // The 'a_character' should be 'a' or 'A'. // |