From 34418e533cc5cc91b4320d1448f261944c35af86 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Thu, 15 Dec 2016 19:08:02 +0000
Subject: [PATCH] Fix some remaining documentation references to MSVC 2013

MSVC 2015 has been the minimum supported version of VS since October.

Differential Revision: https://reviews.llvm.org/D25710

llvm-svn: 289854
---
 cmake/modules/CheckCompilerVersion.cmake | 14 +++++++-------
 docs/CodingStandards.rst                 |  5 ++---
 docs/GettingStarted.rst                  |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cmake/modules/CheckCompilerVersion.cmake b/cmake/modules/CheckCompilerVersion.cmake
index 1c046ade7e1..cdad7ce2765 100644
--- a/cmake/modules/CheckCompilerVersion.cmake
+++ b/cmake/modules/CheckCompilerVersion.cmake
@@ -1,5 +1,5 @@
 # Check if the host compiler is new enough. LLVM requires at least GCC 4.8,
-# MSVC 2013, or Clang 3.1.
+# MSVC 2015 (Update 3), or Clang 3.1.
 
 include(CheckCXXSourceCompiles)
 
@@ -17,8 +17,8 @@ if(NOT DEFINED LLVM_COMPILER_CHECKED)
       endif()
 
       if (CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
-        if (CMAKE_CXX_SIMULATE_VERSION VERSION_LESS 18.0)
-          message(FATAL_ERROR "Host Clang must have at least -fms-compatibility-version=18.0")
+        if (CMAKE_CXX_SIMULATE_VERSION VERSION_LESS 19.0)
+          message(FATAL_ERROR "Host Clang must have at least -fms-compatibility-version=19.0")
         endif()
         set(CLANG_CL 1)
       elseif(NOT LLVM_ENABLE_LIBCXX)
@@ -41,10 +41,10 @@ int main() { return (float)x; }"
         set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
       endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
-        message(FATAL_ERROR "Host Visual Studio must be at least 2013")
-      elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.31101)
-        message(WARNING "Host Visual Studio should at least be 2013 Update 4 (MSVC 18.0.31101)"
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
+        message(FATAL_ERROR "Host Visual Studio must be at least 2015")
+      elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.00.24215.1)
+        message(WARNING "Host Visual Studio should at least be 2015 Update 3 (MSVC 19.00.24215.1)"
           "  due to miscompiles from earlier versions")
       endif()
     endif()
diff --git a/docs/CodingStandards.rst b/docs/CodingStandards.rst
index 2aab3fc992f..722718bf4f1 100644
--- a/docs/CodingStandards.rst
+++ b/docs/CodingStandards.rst
@@ -131,9 +131,8 @@ unlikely to be supported by our host compilers.
 * Delegating constructors: N1986_
 * Default member initializers (non-static data member initializers): N2756_
 
-  * Only use these for scalar members that would otherwise be left
-    uninitialized. Non-scalar members generally have appropriate default
-    constructors.
+  * Feel free to use these wherever they make sense and where the `=`
+    syntax is allowed. Don't use braced initialization syntax.
 
 .. _N2118: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n2118.html
 .. _N2439: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2439.htm
diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst
index ae1f2c3c65d..543f12a859b 100644
--- a/docs/GettingStarted.rst
+++ b/docs/GettingStarted.rst
@@ -262,7 +262,7 @@ our build systems:
 
 * Clang 3.1
 * GCC 4.8
-* Visual Studio 2015
+* Visual Studio 2015 (Update 3)
 
 Anything older than these toolchains *may* work, but will require forcing the
 build system with a special option and is not really a supported host platform.