diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/folly/fix-malloc.diff | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/folly/fix-malloc.diff')
| -rw-r--r-- | ports/folly/fix-malloc.diff | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ports/folly/fix-malloc.diff b/ports/folly/fix-malloc.diff deleted file mode 100644 index db7a23063..000000000 --- a/ports/folly/fix-malloc.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/folly/Malloc.h Mon Oct 09 04:35:09 2017 -+++ b/folly/Malloc.h Fri Oct 13 15:31:36 2017 -@@ -189,9 +189,6 @@ - return false; - } - -- /* Avoid optimizing away the malloc. */ -- asm volatile("" ::"m"(ptr) : "memory"); -- - return (origAllocated != *counter); - }(); - |