Versioning for Thrift, remove thrift/lib/cpp/config.h

[folly.git] / folly / ThreadCachedArena.cpp

diff --git a/folly/ThreadCachedArena.cpp b/folly/ThreadCachedArena.cpp
index e81cfa77519faf659fd7f6bda39ca5354f5c9d59..bcc2ff8e2677a8bc6c2a9ebe2caf82bd90be89fa 100644 (file)
--- a/folly/ThreadCachedArena.cpp
+++ b/folly/ThreadCachedArena.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Facebook, Inc.
+ * Copyright 2014 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-#include "folly/ThreadCachedArena.h"
+#include <folly/ThreadCachedArena.h>
 
 namespace folly {
 
-ThreadCachedArena::ThreadCachedArena(size_t minBlockSize)
-  : minBlockSize_(minBlockSize) {
+ThreadCachedArena::ThreadCachedArena(size_t minBlockSize, size_t maxAlign)
+  : minBlockSize_(minBlockSize), maxAlign_(maxAlign) {
 }
 
 SysArena* ThreadCachedArena::allocateThreadLocalArena() {
-  SysArena* arena = new SysArena(minBlockSize_);
+  SysArena* arena =
+    new SysArena(minBlockSize_, SysArena::kNoSizeLimit, maxAlign_);
   auto disposer = [this] (SysArena* t, TLPDestructionMode mode) {
     std::unique_ptr<SysArena> tp(t);  // ensure it gets deleted
     if (mode == TLPDestructionMode::THIS_THREAD) {