aboutsummaryrefslogtreecommitdiffstats
path: root/fastlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-10-02 19:59:41 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-10-03 16:52:36 +0000
commit6a0ea2d5fce1967927cf1f4f319fb0209ac2eb1e (patch)
treecdf844359ac298e85d5ffc4e15f467964a8c7593 /fastlib
parent74d9d289d9b9ffd5f9f427a1fb7abf176bae4abe (diff)
Checkpoint 1
Diffstat (limited to 'fastlib')
-rw-r--r--fastlib/src/vespa/fastlib/io/bufferedfile.cpp2
-rw-r--r--fastlib/src/vespa/fastlib/io/bufferedfile.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.cpp b/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
index 84eb8534cda..adf201a6e1e 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
@@ -392,7 +392,7 @@ size_t computeBufLen(size_t buflen)
Fast_BufferedFile::Fast_BufferedFile(FastOS_FileInterface *file, size_t bufferSize) :
FastOS_FileInterface(),
_fileleft(static_cast<uint64_t>(-1)),
- _buf(computeBufLen(bufferSize)),
+ _buf(vespalib::alloc::MMapAllocFactory::create(computeBufLen(bufferSize))),
_bufi(NULL),
_bufe(NULL),
_filepos(0),
diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.h b/fastlib/src/vespa/fastlib/io/bufferedfile.h
index 275e066a849..7443b325dd4 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.h
@@ -23,7 +23,7 @@
class Fast_BufferedFile : public FastOS_FileInterface, public vespalib::noncopyable
{
private:
- typedef vespalib::MMapAlloc Alloc;
+ using Alloc = vespalib::alloc::Alloc;
/** The number of bytes left in the file. */
int64_t _fileleft;
/** Pointer to the start of the buffer. Correctly aligned for direct IO */