(wangle) fix after-delete assert

[folly.git] / folly / Arena.h

diff --git a/folly/Arena.h b/folly/Arena.h
index 5ea7552fcf252bc416019c81eb279175fac5b55d..ce758e5b4014fc7a81e7b3a7dec33ba924fd5e10 100644 (file)
--- a/folly/Arena.h
+++ b/folly/Arena.h
@@ -23,10 +23,10 @@
 #include <utility>
 #include <boost/intrusive/slist.hpp>
 
-#include "folly/Conv.h"
-#include "folly/Likely.h"
-#include "folly/Malloc.h"
-#include "folly/Memory.h"
+#include <folly/Conv.h>
+#include <folly/Likely.h>
+#include <folly/Malloc.h>
+#include <folly/Memory.h>
 
 namespace folly {
 
@@ -149,7 +149,7 @@ class Arena {
    private:
     Block() { }
     ~Block() { }
-  } __attribute__((aligned));
+  } __attribute__((__aligned__));
   // This should be alignas(std::max_align_t) but neither alignas nor
   // max_align_t are supported by gcc 4.6.2.
 
@@ -157,6 +157,7 @@ class Arena {
   static constexpr size_t kDefaultMinBlockSize = 4096 - sizeof(Block);
   static constexpr size_t kNoSizeLimit = 0;
   static constexpr size_t kDefaultMaxAlign = alignof(Block);
+  static constexpr size_t kBlockOverhead = sizeof(Block);
 
  private:
   bool isAligned(uintptr_t address) const {
@@ -244,6 +245,6 @@ struct IsArenaAllocator<SysArena> : std::true_type { };
 
 }  // namespace folly
 
-#include "folly/Arena-inl.h"
+#include <folly/Arena-inl.h>
 
 #endif /* FOLLY_ARENA_H_ */