projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
48d3f5e
)
fix ASAN build
author
Bin Liu
<binliu@fb.com>
Thu, 30 Nov 2017 23:52:54 +0000
(15:52 -0800)
committer
Facebook Github Bot
<facebook-github-bot@users.noreply.github.com>
Fri, 1 Dec 2017 00:12:08 +0000
(16:12 -0800)
Summary:
Fix bug in non-jemalloc build.
(Note: this ignores all push blocking failures!)
Reviewed By: igorsugak
Differential Revision:
D6451342
fbshipit-source-id:
44725d4e0c685a59325fa3d08877d0f62120c5c2
folly/memory/Malloc.h
patch
|
blob
|
history
diff --git
a/folly/memory/Malloc.h
b/folly/memory/Malloc.h
index
e774dd0
..
9eaf2c6
100644
(file)
--- a/
folly/memory/Malloc.h
+++ b/
folly/memory/Malloc.h
@@
-144,10
+144,11
@@
namespace folly {
#define FOLLY_MALLOC_CHECKED_MALLOC
#endif
+#include <folly/CPortability.h>
/**
* Determine if we are using jemalloc or not.
*/
-#if
def USE_JEMALLOC
+#if
defined(USE_JEMALLOC) && !FOLLY_SANITIZE
inline bool usingJEMalloc() noexcept {
return true;
}