X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMalloc.cpp;h=d81c30d23119ed26637c6f6e1d586b8b321c622f;hb=edec0c3fd0bb5f709eb8988fed2c782177274197;hp=5f7144dd81007df801446e447c53b0aa08c08ed4;hpb=cd83842807030372e24df337fc9958f5f7f3ba37;p=folly.git diff --git a/folly/Malloc.cpp b/folly/Malloc.cpp index 5f7144dd..d81c30d2 100644 --- a/folly/Malloc.cpp +++ b/folly/Malloc.cpp @@ -14,7 +14,9 @@ * limitations under the License. */ -#include "folly/Malloc.h" +#include + +#include namespace folly { @@ -27,7 +29,7 @@ bool usingJEMallocSlow() { // Some platforms (*cough* OSX *cough*) require weak symbol checks to be // in the form if (mallctl != NULL). Not if (mallctl) or if (!mallctl) (!!). // http://goo.gl/xpmctm - if (allocm == NULL || rallocm == NULL || mallctl == NULL) { + if (allocm == nullptr || rallocm == nullptr || mallctl == nullptr) { return false; }