5 files changed, 8 insertions, 8 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index ab37b33d5..c0e4eda5f 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -2,7 +2,7 @@ macro_name CLANG
 
 binary_name clang++
 
-lang_flags "-std=c++11 -D_REENTRANT"
+lang_flags "-std=c++17 -D_REENTRANT"
 
 warning_flags "-Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual"
 
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index d7e019212..3848fb0dd 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -2,15 +2,15 @@ macro_name GCC
 
 binary_name g++
 
-lang_flags "-std=c++11 -D_REENTRANT"
+lang_flags "-std=c++17 -D_REENTRANT"
 
-# This should only contain flags which are included in GCC 4.8
-warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor"
+# This should only contain flags which are included in GCC 9
+warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor -Wold-style-cast -Wsuggest-override -Wshadow -Wextra-semi"
 
 # Boost headers have 0 as nullptr and non-virtual-dtor issues so we can't werror on them
 werror_flags "-Werror -Wno-error=strict-overflow -Wno-error=zero-as-null-pointer-constant -Wno-error=non-virtual-dtor"
 
-maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast -Wsuggest-override -Wshadow -Wextra-semi"
+maintainer_warning_flags "-Wstrict-overflow=5"
 
 optimization_flags "-O3"
 sanitizer_optimization_flags "-O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index c8a1aa3dc..fcf5786d7 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -5,7 +5,7 @@ binary_name icpc
 optimization_flags "-O2"
 size_optimization_flags "-Os"
 
-lang_flags "-std=c++11"
+lang_flags "-std=c++17"
 warning_flags "-w1"
 shared_flags "-fPIC"
 
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 3dd8e00b0..094a74ef0 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -6,7 +6,7 @@ optimization_flags "-xO2"
 
 shared_flags "-KPIC"
 warning_flags "+w -erroff=truncwarn,wnoretvalue,wlessrestrictedthrow"
-lang_flags "-std=c++11 +p -features=extensions"
+lang_flags "-std=c++17 +p -features=extensions"
 
 ar_command CC
 ar_options "-xar -o"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index a54b7f91f..8a7b46d15 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -4,7 +4,7 @@ binary_name xlC
 
 optimization_flags "-O2"
 
-lang_flags "-std=c++11"
+lang_flags "-std=c++17"
 
 visibility_build_flags "-fvisibility=hidden"
 visibility_attribute '__attribute__((visibility("default")))'