AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

invert the logic of the c++98 default test

Browse Source 
this is much more intuitive, and actually produces a sensible result
with configure -recheck after a compiler upgrade.

Change-Id: Icfa0b85377d9fc014e66490c8ebf6c9236df978e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-11-02 16:50:04 +01:00
parent 66ad9668f3
commit 4b1115742a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.tests/common/c++98default/c++98default.cpp
View File

@ -37,8 +37,8 @@
** **
****************************************************************************/ ****************************************************************************/
#if __cplusplus >= 201103L #if __cplusplus < 201103L
#error "compiler uses c++11 or higher by default" #error "compiler does not use c++11 or higher by default"
#endif #endif
int main(int, char **) {} int main(int, char **) {}

10
configure.json
View File

@ -281,8 +281,8 @@
"type": "compile", "type": "compile",
"test": "common/c++1z" "test": "common/c++1z"
}, },
"cxx98default": { "cxx11default": {
"label": "compiler defaulting to C++98", "label": "compiler defaulting to C++11 or higher",
"type": "compile", "type": "compile",
"test": "common/c++98default" "test": "common/c++98default"
}, },
@ -483,9 +483,9 @@
"condition": "call.crossCompile", "condition": "call.crossCompile",
"output": [ "publicConfig", "privateConfig" ] "output": [ "publicConfig", "privateConfig" ]
}, },
"cxx98default": { "cxx11default": {
"label": "Compiler defaults to C++98", "label": "Compiler defaults to C++11 or higher",
"condition": "tests.cxx98default", "condition": "!tests.cxx11default",
"output": [ { "type": "publicConfig", "name": "c++11" } ] "output": [ { "type": "publicConfig", "name": "c++11" } ]
}, },
"compiler-flags": { "compiler-flags": {