diff --git a/.cmake/ConfigureCompilerFlags.cmake b/.cmake/ConfigureCompilerFlags.cmake
index 97c51f652..5995719f3 100644
--- a/.cmake/ConfigureCompilerFlags.cmake
+++ b/.cmake/ConfigureCompilerFlags.cmake
@@ -1,4 +1,4 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-unused-result -Wno-deprecated-declarations")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wno-unused-result -Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -g -frtti -fexceptions")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh
index 5c0dd93eb..e050990fe 100755
--- a/script/build-vendor-libraries.sh
+++ b/script/build-vendor-libraries.sh
@@ -108,7 +108,7 @@ function fetch_packages() {
function build_boost() {
BOOST_CXX_FLAGS="-fPIC"
if [[ $OS == "Darwin" ]]; then
- BOOST_CXX_FLAGS="-fPIC -std=c++14 -stdlib=libc++"
+ BOOST_CXX_FLAGS="-fPIC -std=c++17 -stdlib=libc++"
fi
tar xvfj boost_${BOOST_VERSION}.tar.bz2
diff --git a/src/3rdparty/3rdparty.vcxproj b/src/3rdparty/3rdparty.vcxproj
index 6b0744ddb..1f73ba4ad 100755
--- a/src/3rdparty/3rdparty.vcxproj
+++ b/src/3rdparty/3rdparty.vcxproj
@@ -259,6 +259,7 @@
$(IntDir)
$(IntDir)$(ProjectName).pdb
true
+ stdcpp17
@@ -277,6 +278,7 @@
$(IntDir)
$(IntDir)$(ProjectName).pdb
true
+ stdcpp17
@@ -295,6 +297,7 @@
$(IntDir)
$(IntDir)$(ProjectName).pdb
true
+ stdcpp17
@@ -313,6 +316,7 @@
$(IntDir)
$(IntDir)$(ProjectName).pdb
true
+ stdcpp17
@@ -331,6 +335,7 @@
$(IntDir)
$(IntDir)$(ProjectName).pdb
true
+ stdcpp17
@@ -349,6 +354,7 @@
$(IntDir)
$(IntDir)$(ProjectName).pdb
true
+ stdcpp17
@@ -369,6 +375,7 @@
true
Sync
true
+ stdcpp17
@@ -389,6 +396,7 @@
true
Sync
true
+ stdcpp17
@@ -409,6 +417,7 @@
true
Sync
true
+ stdcpp17
@@ -429,6 +438,7 @@
true
Sync
true
+ stdcpp17
@@ -449,6 +459,7 @@
true
Sync
true
+ stdcpp17
@@ -469,6 +480,7 @@
true
Sync
true
+ stdcpp17
diff --git a/src/core_c_demo/core_c_demo.vcxproj b/src/core_c_demo/core_c_demo.vcxproj
index 871c7e106..026f321ed 100644
--- a/src/core_c_demo/core_c_demo.vcxproj
+++ b/src/core_c_demo/core_c_demo.vcxproj
@@ -285,6 +285,7 @@
$(IntDir)vc$(PlatformToolsetVersion).pdb
true
+ stdcpp17
../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories)
@@ -326,6 +327,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
true
+ stdcpp17
../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories)
@@ -367,6 +369,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
true
+ stdcpp17
../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories)
@@ -406,6 +409,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
$(IntDir)vc$(PlatformToolsetVersion).pdb
true
+ stdcpp17
../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories)
@@ -445,6 +449,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
true
+ stdcpp17
../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories)
@@ -484,6 +489,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
true
+ stdcpp17
../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories)
@@ -525,6 +531,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
true
Sync
+ stdcpp17
../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories)
@@ -572,6 +579,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
Sync
+ stdcpp17
../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;$(OutputPath);%(AdditionalLibraryDirectories)
@@ -619,6 +627,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
Sync
+ stdcpp17
../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories)
@@ -665,6 +674,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
true
Sync
+ stdcpp17
../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories)
@@ -711,6 +721,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
Sync
+ stdcpp17
../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;$(OutputPath);%(AdditionalLibraryDirectories)
@@ -757,6 +768,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e
Sync
+ stdcpp17
../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories)
diff --git a/src/musikcore/library/track/TrackList.cpp b/src/musikcore/library/track/TrackList.cpp
index e098a879f..145f6be8a 100755
--- a/src/musikcore/library/track/TrackList.cpp
+++ b/src/musikcore/library/track/TrackList.cpp
@@ -47,12 +47,15 @@
#include
#include
#include