From f9383e01402ba428aa7b26b6ec7019db08ea86d6 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 4 Jun 2021 09:09:52 -0400
Subject: VS: Re-order v141 and v142 CL flag table entries to match xml files
 better

---
 Templates/MSBuild/FlagTables/v141_CL.json | 28 ++++++++++++++--------------
 Templates/MSBuild/FlagTables/v142_CL.json | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'Templates')

diff --git a/Templates/MSBuild/FlagTables/v141_CL.json b/Templates/MSBuild/FlagTables/v141_CL.json
index 01fafe48df..d4701f3cd1 100644
--- a/Templates/MSBuild/FlagTables/v141_CL.json
+++ b/Templates/MSBuild/FlagTables/v141_CL.json
@@ -588,6 +588,20 @@
     "value": "Send",
     "flags": []
   },
+  {
+    "name": "SupportJustMyCode",
+    "switch": "JMC-",
+    "comment": "",
+    "value": "false",
+    "flags": []
+  },
+  {
+    "name": "SupportJustMyCode",
+    "switch": "JMC",
+    "comment": "",
+    "value": "true",
+    "flags": []
+  },
   {
     "name": "CompileAsWinRT",
     "switch": "ZW",
@@ -1250,19 +1264,5 @@
     "comment": "C++14 (GNU Dialect)",
     "value": "gnu++1y",
     "flags": []
-  },
-  {
-    "name": "SupportJustMyCode",
-    "switch": "JMC-",
-    "comment": "",
-    "value": "false",
-    "flags": []
-  },
-  {
-    "name": "SupportJustMyCode",
-    "switch": "JMC",
-    "comment": "",
-    "value": "true",
-    "flags": []
   }
 ]
diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index 3305e5643a..68dcb13097 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -433,6 +433,20 @@
     "value": "Spectre",
     "flags": []
   },
+  {
+    "name": "ConformanceMode",
+    "switch": "permissive-",
+    "comment": "Conformance mode enabled",
+    "value": "true",
+    "flags": []
+  },
+  {
+    "name": "ConformanceMode",
+    "switch": "permissive",
+    "comment": "Conformance mode disabled",
+    "value": "false",
+    "flags": []
+  },
   {
     "name": "LanguageStandard",
     "switch": "std:c++14",
@@ -879,20 +893,6 @@
     "value": "true",
     "flags": []
   },
-  {
-    "name": "ConformanceMode",
-    "switch": "permissive-",
-    "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-",
-- 
cgit v1.2.1