From a7973ccb5310b24acdc9176555b458bad6000a43 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 24 Jan 2019 12:56:52 -0500
Subject: VS: Populate `/permissive` flag table entry for v142

Apply the change from commit e0d6d01e52 (VS: Add flag table entry for
"permissive" flag to disable conformance mode, 2018-12-10) to the
v142 flag table.
---
 Templates/MSBuild/FlagTables/v142_CL.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index 479df03..95b9d14 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -833,11 +833,18 @@
   {
     "name": "ConformanceMode",
     "switch": "permissive-",
-    "comment": "Conformance mode",
+    "comment": "Conformance mode enabled",
     "value": "true",
     "flags": []
   },
   {
+    "name": "ConformanceMode",
+    "switch": "permissive",
+    "comment": "Conformance mode disabled",
+    "value": "false",
+    "flags": []
+  },
+  {
     "name": "TreatWChar_tAsBuiltInType",
     "switch": "Zc:wchar_t-",
     "comment": "Treat WChar_t As Built in Type",
-- 
cgit v0.12