Fix FunctionScheduler::resetFunctionTimer concurrency bug
[folly.git] / folly / small_vector.h
index 71440437f672b4978c5746b83f23582377ba8907..d8911a077b2dd9fb561ceb52ca8c9f1c75ad44c4 100644 (file)
 #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