From 40c8aab459f6692f68daa0ef431b80ca7ab364c1 Mon Sep 17 00:00:00 2001
From: nicole mazzuca <mazzucan@outlook.com>
Date: Thu, 6 Aug 2020 17:04:47 -0700
Subject: [vcpkg] Fix vs2015 build (#12789)

* move windows bootstrap directory

* fix paths

* actually fix the build

* fix path
---
 toolsrc/src/vcpkg/sourceparagraph.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'toolsrc/src')

diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp
index 8b16d0846..7bd560c8a 100644
--- a/toolsrc/src/vcpkg/sourceparagraph.cpp
+++ b/toolsrc/src/vcpkg/sourceparagraph.cpp
@@ -839,7 +839,7 @@ namespace vcpkg
         constexpr static StringLiteral FEATURES = "features";
         constexpr static StringLiteral DEFAULT_FEATURES = "default-features";
         constexpr static StringLiteral PLATFORM = "platform";
-        constexpr static StringView KNOWN_FIELDS[] = {NAME, FEATURES, DEFAULT_FEATURES, PLATFORM};
+        const static StringView KNOWN_FIELDS[4]; // not constexpr in MSVC 2015
 
         Optional<Dependency> visit_string(Json::Reader&, StringView, StringView sv)
         {
@@ -889,6 +889,7 @@ namespace vcpkg
             return dep;
         }
     };
+    const StringView DependencyField::KNOWN_FIELDS[] = {NAME, FEATURES, DEFAULT_FEATURES, PLATFORM};
 
     struct FeatureField : Json::VisitorCrtpBase<FeatureField>
     {
@@ -898,7 +899,7 @@ namespace vcpkg
         constexpr static StringLiteral NAME = "name";
         constexpr static StringLiteral DESCRIPTION = "description";
         constexpr static StringLiteral DEPENDENCIES = "dependencies";
-        constexpr static StringView KNOWN_FIELDS[] = {NAME, DESCRIPTION, DEPENDENCIES};
+        const static StringView KNOWN_FIELDS[3]; // Not constexpr in MSVC 2015
 
         Optional<std::unique_ptr<FeatureParagraph>> visit_object(Json::Reader& r, StringView, const Json::Object& obj)
         {
@@ -930,6 +931,7 @@ namespace vcpkg
             return std::move(feature);
         }
     };
+    const StringView FeatureField::KNOWN_FIELDS[] = {NAME, DESCRIPTION, DEPENDENCIES};
 
     Parse::ParseExpected<SourceControlFile> SourceControlFile::parse_manifest_file(const fs::path& path_to_manifest,
                                                                                    const Json::Object& manifest)
-- 
cgit v1.2.3