SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update .pro file and add test C++17 statements to main

Browse Source 
The test statements are making sure C++17 features are enabled on all
compilers. They should not be pushed to master as they are.
This commit is contained in:
Vasily
2019-01-23 19:31:03 +01:00
parent c10e45d2ab
commit cd6403b8ff
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
advancedSettings.pro
+1 -1
View File
@@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
QT += core gui qml quick multimedia widgets 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 DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE
src/main.cpp
+9
View File
@@ -348,6 +348,15 @@ int main( int argc, char* argv[] )
{ {
setUpLogging( argc, 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( const bool desktopMode = argument::CheckCommandLineArgument(
argc, argv, argument::kDesktopMode ); argc, argv, argument::kDesktopMode );
const bool noSound const bool noSound