From fe4a921836cf065d6cb85d59d1c9244552c981da Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 8 Nov 2017 22:26:33 +0100 Subject: [PATCH] ui: Added new clang 5.0.0 language standards to project setup dropdown box --- src/lib/settings/SourceGroupSettingsCxx.cpp | 25 +++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/lib/settings/SourceGroupSettingsCxx.cpp b/src/lib/settings/SourceGroupSettingsCxx.cpp index 68375921..de1ee2da 100644 --- a/src/lib/settings/SourceGroupSettingsCxx.cpp +++ b/src/lib/settings/SourceGroupSettingsCxx.cpp @@ -61,6 +61,12 @@ std::vector SourceGroupSettingsCxx::getAvailableLanguageStandards() { case SOURCE_GROUP_CPP_EMPTY: case SOURCE_GROUP_CXX_CDB: + standards.push_back("c++2a"); + standards.push_back("gnu++2a"); + + standards.push_back("c++17"); + standards.push_back("gnu++17"); + standards.push_back("c++1z"); standards.push_back("gnu++1z"); @@ -77,28 +83,29 @@ std::vector SourceGroupSettingsCxx::getAvailableLanguageStandards() standards.push_back("gnu++0x"); standards.push_back("c++03"); + standards.push_back("gnu++03"); standards.push_back("c++98"); standards.push_back("gnu++98"); break; case SOURCE_GROUP_C_EMPTY: - standards.push_back("c1x"); - standards.push_back("gnu1x"); - standards.push_back("iso9899:201x"); - standards.push_back("c11"); standards.push_back("gnu11"); standards.push_back("iso9899:2011"); - standards.push_back("c9x"); - standards.push_back("gnu9x"); - standards.push_back("iso9899:199x"); + standards.push_back("c1x"); + standards.push_back("gnu1x"); + standards.push_back("iso9899:201x"); standards.push_back("c99"); standards.push_back("gnu99"); standards.push_back("iso9899:1999"); + standards.push_back("c9x"); + standards.push_back("gnu9x"); + standards.push_back("iso9899:199x"); + standards.push_back("iso9899:199409"); standards.push_back("c90"); @@ -193,9 +200,9 @@ std::string SourceGroupSettingsCxx::getDefaultStandard() const switch (getType()) { case SOURCE_GROUP_CPP_EMPTY: - return "c++1z"; + return "c++17"; case SOURCE_GROUP_C_EMPTY: - return "c1x"; + return "c11"; case SOURCE_GROUP_CXX_CDB: default: break;