summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2017-06-15 21:56:42 +0300
committerOrgad Shaneh <orgads@gmail.com>2017-06-20 07:02:19 +0000
commitb89888ca9d6d10c850619c726e38584ca6637578 (patch)
tree2cdfc5c9b571503fb6bb123e7aba860ca679e027
parent1df1745c6373512289c3df5ca043c5e32d09e01d (diff)
downloadqt-creator-b89888ca9d6d10c850619c726e38584ca6637578.tar.gz
Clang: substitute __float128 with short instead of void
There is an argument of this type in std_abs.h. void argument is invalid. Replacing with float, double or long double causes an error in type_traits, which has template specializations for __is_floating_point_helper for all these types. Change-Id: Ife95fa992cbf9684bc67a2098d6609a9a925d015 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index d65b7caff6..e55832ab86 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -392,7 +392,7 @@ void CompilerOptionsBuilder::addDefineFloat128ForMingw()
// TODO: Remove once this is fixed in clang >= 3.9.
// https://llvm.org/bugs/show_bug.cgi?id=30685
if (m_projectPart.toolchainType == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID)
- addDefine("#define __float128 void");
+ addDefine("#define __float128 short");
}
QString CompilerOptionsBuilder::includeDirOption() const