diff options
| author | Larry-Hu <v-daih@microsoft.com> | 2018-06-14 23:02:56 -0700 |
|---|---|---|
| committer | Larry-Hu <v-daih@microsoft.com> | 2018-06-14 23:02:56 -0700 |
| commit | 331c1ea8fe4f217021173ad730e08e00c030b05f (patch) | |
| tree | 12923567e14751f480733894e34e941ab05d49ae /ports/folly/fixC2338.patch | |
| parent | 7ba1c76781afd4ab4cd5afda8f21d296715f780d (diff) | |
| download | vcpkg-331c1ea8fe4f217021173ad730e08e00c030b05f.tar.gz vcpkg-331c1ea8fe4f217021173ad730e08e00c030b05f.zip | |
Add option -D_DISABLE_EXTENDED_ALIGNED to disable error C2338 in Folly
Diffstat (limited to 'ports/folly/fixC2338.patch')
| -rw-r--r-- | ports/folly/fixC2338.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ports/folly/fixC2338.patch b/ports/folly/fixC2338.patch new file mode 100644 index 000000000..2a40e4f89 --- /dev/null +++ b/ports/folly/fixC2338.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
+index 0b97bfd..e442c73 100644
+--- a/CMake/FollyCompilerMSVC.cmake
++++ b/CMake/FollyCompilerMSVC.cmake
+@@ -268,7 +268,7 @@ function(apply_folly_compile_options_to_target THETARGET)
+ _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.
+ _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
+ _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
+-
++ _DISABLE_EXTENDED_ALIGNED_STORAGE
+ _STL_EXTRA_DISABLED_WARNINGS=4774\ 4987
+
+ $<$<BOOL:${MSVC_ENABLE_CPP_LATEST}>:_HAS_AUTO_PTR_ETC=1> # We're building in C++ 17 or greater mode, but certain dependencies (Boost) still have dependencies on unary_function and binary_function, so we have to make sure not to remove them.
|