Fix FunctionScheduler::resetFunctionTimer concurrency bug

[folly.git] / folly / small_vector.h

diff --git a/folly/small_vector.h b/folly/small_vector.h
index b8009b018acf4e1231fc20a13a772ce71518a24c..d8911a077b2dd9fb561ceb52ca8c9f1c75ad44c4 100644 (file)
--- a/folly/small_vector.h
+++ b/folly/small_vector.h
@@ -48,10 +48,10 @@
 #include <folly/Assume.h>
 #include <folly/ConstexprMath.h>
 #include <folly/FormatTraits.h>
-#include <folly/Malloc.h>
 #include <folly/Portability.h>
 #include <folly/SmallLocks.h>
 #include <folly/Traits.h>
+#include <folly/memory/Malloc.h>
 #include <folly/portability/BitsFunctexcept.h>
 #include <folly/portability/Malloc.h>
 #include <folly/portability/TypeTraits.h>
@@ -378,7 +378,7 @@ T* pointerFlagClear(T* p) {
 inline void* shiftPointer(void* p, size_t sizeBytes) {
   return static_cast<char*>(p) + sizeBytes;
 }
-}
+} // namespace detail
 
 //////////////////////////////////////////////////////////////////////
 FOLLY_PACK_PUSH
@@ -1137,7 +1137,7 @@ class small_vector : public detail::small_vector_base<
 
   union Data {
     explicit Data() {
-      pdata_.heap_ = 0;
+      pdata_.heap_ = nullptr;
     }
 
     PointerType pdata_;