Compile in whatever C++ version is default.
There's no need to force C++17 (to gain C++17 features) since Chromium
has long built in C++17 mode, and in fact this hinders moving to C++20.
Use the version of C++ that the surrounding environment defaults to.
This CL is a copy of
https://chromium-review.googlesource.com/c/chromium/src/+/4245781.
Bug: chromium:1284275
Change-Id: I2072947e33c6a923d8f1260c3eff49e11ee9d14e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103753
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 4835fb3..6785ff5 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -74,11 +74,6 @@
"SKIA_IMPLEMENTATION=1",
]
- # Skia uses C++17 language features in its internal code. Previously Skia was built with
- # "-std=c++17". See http://crbug.com/1257145 for why this was a bad idea.
- cflags_cc = [ "-Wno-c++17-extensions" ]
- cflags_objcc = [ "-Wno-c++17-extensions" ]
-
if (current_cpu == "arm") {
if (arm_use_neon) {
defines += [ "SK_ARM_HAS_NEON" ]
@@ -385,12 +380,9 @@
if (is_win) {
cflags_cc = [
- "/std:c++17",
"/wd5041", # out-of-line definition for constexpr static data member is
# not needed and is deprecated in C++17
]
- } else {
- cflags_cc = [ "-std=c++17" ]
}
}
}