diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-04 11:49:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 11:49:56 -0700 |
| commit | 4467eb334aa93b18858305697cf8c20950c4e925 (patch) | |
| tree | 527b5855ef13af278459761f667e3c7568126321 /toolsrc/include | |
| parent | a3142da3ac59928d694de35631d174b19c06a471 (diff) | |
| download | vcpkg-4467eb334aa93b18858305697cf8c20950c4e925.tar.gz vcpkg-4467eb334aa93b18858305697cf8c20950c4e925.zip | |
fix compile on g++ 6 (#13290)
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/base/json.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/include/vcpkg/base/json.h b/toolsrc/include/vcpkg/base/json.h index 3539f2df4..7cdcb0162 100644 --- a/toolsrc/include/vcpkg/base/json.h +++ b/toolsrc/include/vcpkg/base/json.h @@ -287,8 +287,8 @@ namespace vcpkg::Json underlying_t underlying_; }; - VCPKG_MSVC_WARNING(push); - VCPKG_MSVC_WARNING(disable : 4505); + VCPKG_MSVC_WARNING(push) + VCPKG_MSVC_WARNING(disable : 4505) template<class Type> Span<const StringView> IDeserializer<Type>::valid_fields() const @@ -332,7 +332,7 @@ namespace vcpkg::Json return nullopt; } - VCPKG_MSVC_WARNING(pop); + VCPKG_MSVC_WARNING(pop) struct ReaderError { |