diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-09-07 16:48:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 16:48:46 -0700 |
| commit | a35ddddac86ec62fa25c7eea605bb4abf84eb705 (patch) | |
| tree | adbd4fb91a08b590b392eb23797d559b137b48f6 /toolsrc/src | |
| parent | 0d0a84694c8c939e7ac12cae3975dd4c18ca71ec (diff) | |
| download | vcpkg-a35ddddac86ec62fa25c7eea605bb4abf84eb705.tar.gz vcpkg-a35ddddac86ec62fa25c7eea605bb4abf84eb705.zip | |
[vcpkg] Fix compilation on VS2015 (#13398)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/sourceparagraph.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index 27861f873..e13fcfdb7 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -490,6 +490,18 @@ namespace vcpkg constexpr StringLiteral FeatureDeserializer::DESCRIPTION; constexpr StringLiteral FeatureDeserializer::DEPENDENCIES; + static constexpr StringView EXPRESSION_WORDS[] = { + "WITH", + "AND", + "OR", + }; + static constexpr StringView VALID_LICENSES[] = +#include "spdx-licenses.inc" + ; + static constexpr StringView VALID_EXCEPTIONS[] = +#include "spdx-licenses.inc" + ; + // We "parse" this so that we can add actual license parsing at some point in the future // without breaking anyone struct LicenseExpressionDeserializer : Json::IDeserializer<std::string> @@ -503,18 +515,6 @@ namespace vcpkg ExpectException, }; - constexpr static StringView EXPRESSION_WORDS[] = { - "WITH", - "AND", - "OR", - }; - constexpr static StringView VALID_LICENSES[] = -#include "spdx-licenses.inc" - ; - constexpr static StringView VALID_EXCEPTIONS[] = -#include "spdx-licenses.inc" - ; - virtual Optional<std::string> visit_string(Json::Reader&, StringView sv) override { Mode mode = Mode::ExpectExpression; @@ -630,10 +630,6 @@ namespace vcpkg } }; - constexpr StringView LicenseExpressionDeserializer::EXPRESSION_WORDS[]; - constexpr StringView LicenseExpressionDeserializer::VALID_LICENSES[]; - constexpr StringView LicenseExpressionDeserializer::VALID_EXCEPTIONS[]; - struct ManifestDeserializer : Json::IDeserializer<std::unique_ptr<SourceControlFile>> { virtual StringView type_name() const override { return "a manifest"; } |