diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-08-06 17:04:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 17:04:47 -0700 |
| commit | 40c8aab459f6692f68daa0ef431b80ca7ab364c1 (patch) | |
| tree | d49c575bd7be93b2522293e5d54a7ce743b08355 /toolsrc/src | |
| parent | 61c055a6fcfee2a7e764997bb2478adf49db6edf (diff) | |
| download | vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.tar.gz vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.zip | |
[vcpkg] Fix vs2015 build (#12789)
* move windows bootstrap directory
* fix paths
* actually fix the build
* fix path
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/sourceparagraph.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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) |