From c08b859996cae942eb4919a9f4e1abe37154ab21 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Mon, 29 May 2017 18:22:10 +0100
Subject: [PATCH] MSVC2017: Add appveyor testing. Disable C++14 constexpr
 support as our tests don't pass.

---
 appveyor.yml                              | 12 ++++++++----
 include/boost/config/compiler/visualc.hpp |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5023f41b..190d6fa9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,6 +16,12 @@ platform:
 
 environment:
   matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARGS: --toolset=msvc-14.1 address-model=64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARGS: --toolset=msvc-14.1 address-model=32
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest
     - ARGS: --toolset=msvc-9.0  address-model=32
     - ARGS: --toolset=msvc-10.0 address-model=32
     - ARGS: --toolset=msvc-11.0 address-model=32
@@ -23,6 +29,7 @@ environment:
     - ARGS: --toolset=msvc-14.0 address-model=32
     - ARGS: --toolset=msvc-12.0 address-model=64
     - ARGS: --toolset=msvc-14.0 address-model=64
+    - ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
     - ARGS: --toolset=gcc address-model=64
       PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
     - ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z
@@ -44,14 +51,11 @@ install:
   - git submodule update --init libs/type_traits
   - bootstrap
   - b2 headers
-  - dir
-
+  
 build: off
 
 test_script:
-  - dir
   - cd libs\config\test
   - ..\..\..\b2 config_info_travis_install %ARGS%
-  - dir
   - config_info_travis
   - ..\..\..\b2 -j3 %ARGS%
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index f51f0e1d..53c5ed6e 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -194,7 +194,6 @@
 //
 #if (_MSC_VER < 1910)
 #  define BOOST_NO_CXX14_AGGREGATE_NSDMI
-#  define BOOST_NO_CXX14_CONSTEXPR
 #endif
 
 // MSVC including version 14 has not yet completely
@@ -218,6 +217,7 @@
 //
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #define BOOST_NO_CXX11_SFINAE_EXPR
+#  define BOOST_NO_CXX14_CONSTEXPR
 
 //
 // Things that don't work in clr mode: