commit 60045811c0898d842a71f715d88c4e68039d4926
author Peter Collingbourne <pcc@google.com> Thu Dec 06 02:07:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 06 02:07:31 2018 +0000
tree 033574d00752e3b6972ce65996731f294aa10152
parent a0aaf2f43e98ed25e66bb5270fba881c14684993
parent d7225eaac48add9bdb6fb796f2553a7a823ac6a4

Merge "Stop mapping c++17 to c++1z."

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index ad1fc6d..ea64b6a 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -414,9 +414,6 @@
 		cppStd = config.CppStdVersion
 	case "experimental":
 		cppStd = config.ExperimentalCppStdVersion
-	case "c++17", "gnu++17":
-		// Map c++17 and gnu++17 to their 1z equivalents, until 17 is finalized.
-		cppStd = strings.Replace(String(compiler.Properties.Cpp_std), "17", "1z", 1)
 	}
 
 	if compiler.Properties.Gnu_extensions != nil && *compiler.Properties.Gnu_extensions == false {