diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-10-13 17:19:31 +0300 |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-10-17 03:55:22 +0300 |
| commit | 9153ac76be6654aae436ec0b35942ebb84c6d4e3 (patch) | |
| tree | 12df2df116352f726f1df050161a9058dc3cdd7c /ports/folly/fix-histogram.diff | |
| parent | 7ed8d4f75e903fdad4c02b4e784f2f4bcb30a3b0 (diff) | |
| download | vcpkg-9153ac76be6654aae436ec0b35942ebb84c6d4e3.tar.gz vcpkg-9153ac76be6654aae436ec0b35942ebb84c6d4e3.zip | |
[folly] Update to version v2017.10.02.00
Diffstat (limited to 'ports/folly/fix-histogram.diff')
| -rw-r--r-- | ports/folly/fix-histogram.diff | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ports/folly/fix-histogram.diff b/ports/folly/fix-histogram.diff new file mode 100644 index 000000000..ca92a891e --- /dev/null +++ b/ports/folly/fix-histogram.diff @@ -0,0 +1,11 @@ +--- a/folly/stats/Histogram.h ++++ b/folly/stats/Histogram.h +@@ -485,7 +485,7 @@ + // with /permissive- (the default for the CMake build), so we directly include + // the -defs as if it were -inl, and don't provide the explicit instantiations. + // https://developercommunity.visualstudio.com/content/problem/81223/incorrect-error-c5037-with-permissive.html +-#if defined(_MSC_VER) && _MSC_FULL_VER >= 191125506 && _MSC_FULL_VER < 191125542 ++#if defined(_MSC_VER) && _MSC_FULL_VER >= 191125506 && _MSC_FULL_VER <= 191125547 + #define FOLLY_MSVC_USE_WORKAROUND_FOR_C5037 1 + #else + #define FOLLY_MSVC_USE_WORKAROUND_FOR_C5037 0 |
