diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2017-06-02 21:18:27 +0100 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2017-06-03 18:10:31 +0000 |
| commit | acaaa84d7e6cafda80fdaa2b914dc09ba21ce42d (patch) | |
| tree | 545ed3cba3c4e07b6a53d029f5a2d487864b1c71 /config.tests | |
| parent | 6e97d091e4d30566c14cf726f44d9e17f819c2c2 (diff) | |
| download | qtbase-acaaa84d7e6cafda80fdaa2b914dc09ba21ce42d.tar.gz | |
Fix build with clang 4.0 and libstdc++ 7.1.1
With this setup clang cannot use c++1z yet.
Fixed with clang 5.0.
In file included from /data/sources/qt/qt5/qtbase/src/corelib/codecs/qtextcodec.cpp:53:
In file included from ../../../include/QtCore/5.9.1/QtCore/private/qcoreglobaldata_p.h:1:
In file included from ../../../include/QtCore/5.9.1/QtCore/private/../../../../../../../../../sources/qt/qt5/qtbase/src/corelib/kernel/qcoreglobaldata_p.h:55:
In file included from ../../../include/QtCore/qmap.h:1:
In file included from ../../../include/QtCore/../../../../../../sources/qt/qt5/qtbase/src/corelib/tools/qmap.h:52:
In file included from /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.1.1/../../../../include/c++/7.1.1/map:60:
In file included from /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.1.1/../../../../include/c++/7.1.1/bits/stl_tree.h:72:
In file included from /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.1.1/../../../../include/c++/7.1.1/bits/node_handle.h:39:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.1.1/../../../../include/c++/7.1.1/optional:1032:27: error: use of class template 'optional' requires template arguments
Change-Id: Ib4cd8a9f5791a6e6cae4e6d61dfec3ad50dd63ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/common/c++1z/c++1z.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.tests/common/c++1z/c++1z.cpp b/config.tests/common/c++1z/c++1z.cpp index a30196f57d..63c6fb5b8a 100644 --- a/config.tests/common/c++1z/c++1z.cpp +++ b/config.tests/common/c++1z/c++1z.cpp @@ -43,4 +43,6 @@ # error "__cplusplus must be > 201402L (the value for C++14)" #endif +#include <map> // https://bugs.llvm.org//show_bug.cgi?id=33117 + int main(int, char **) { return 0; } |