diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-16 19:47:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-16 19:47:08 +0000 |
commit | 3dc92c36aa6f58a2ce2f57089501364dab6a44bc (patch) | |
tree | d48b2ca1cee14621dd7c51e3a6ba089ca18e43fe /memfilepersistence | |
parent | 1ab845031009400d8222f2c4affffaeaba3ccd71 (diff) |
Remove the XXXFactory indirection. Just use static method on Alloc.
Diffstat (limited to 'memfilepersistence')
-rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.cpp | 3 | ||||
-rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.cpp index a998bb7d90e..acf7ac6a69d 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/buffer.cpp @@ -5,7 +5,6 @@ #include <algorithm> #include <stdlib.h> -using vespalib::DefaultAlloc; using vespalib::alloc::MemoryAllocator; using vespalib::alloc::Alloc; @@ -16,7 +15,7 @@ namespace memfile { // It is crucial that any backing buffer type returns an address that is // 512-byte aligned, or direct IO will scream at us and fail everything. Buffer::Buffer(size_t size) - : _buffer(DefaultAlloc::create(size, MemoryAllocator::HUGEPAGE_SIZE, 512)), + : _buffer(Alloc::alloc(size, MemoryAllocator::HUGEPAGE_SIZE, 512)), _size(size) { } diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h index c564893a154..d305d6a8e25 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h @@ -77,7 +77,7 @@ public: typedef vespalib::LinkedPtr<SharedBuffer> LP; explicit SharedBuffer(size_t totalSize) - : _buf(vespalib::alloc::MMapAllocFactory::create(totalSize)), + : _buf(vespalib::alloc::Alloc::allocMMap(totalSize)), _usedSize(0) { } |