From cd6403b8ffb1729397f2213a3783f0452eb4a048 Mon Sep 17 00:00:00 2001 From: Vasily Date: Wed, 23 Jan 2019 19:31:03 +0100 Subject: [PATCH] Update .pro file and add test C++17 statements to main The test statements are making sure C++17 features are enabled on all compilers. They should not be pushed to master as they are. --- advancedSettings.pro | 2 +- src/main.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/advancedSettings.pro b/advancedSettings.pro index a16d072..e66e72e 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -5,7 +5,7 @@ #------------------------------------------------- QT += core gui qml quick multimedia widgets -CONFIG += c++14 +CONFIG += c++1z DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE diff --git a/src/main.cpp b/src/main.cpp index cbc85c6..70ecddd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -348,6 +348,15 @@ int main( int argc, char* argv[] ) { setUpLogging( argc, argv ); + // Initializers in if statements is a C++17 feature. Should be removed after + // making sure CI works with this. + if ( constexpr int i = 2; i > 10 ) + { + // static_assert with no message is a C++17 feature. Should be removed + // after making sure CI works with this. + static_assert( i < 5 ); + } + const bool desktopMode = argument::CheckCommandLineArgument( argc, argv, argument::kDesktopMode ); const bool noSound