Rename get_memory_allocator to make_memory_allocator in mmap file allocator

factory.  Remove virtual keyword.

3 files changed, 5 insertions, 5 deletions

diff --git a/vespalib/src/tests/util/mmap_file_allocator_factory/mmap_file_allocator_factory_test.cpp b/vespalib/src/tests/util/mmap_file_allocator_factory/mmap_file_allocator_factory_test.cpp
index fea8f6106d4..f5c0317f623 100644
--- a/vespalib/src/tests/util/mmap_file_allocator_factory/mmap_file_allocator_factory_test.cpp
+++ b/vespalib/src/tests/util/mmap_file_allocator_factory/mmap_file_allocator_factory_test.cpp
@@ -23,15 +23,15 @@ bool is_mmap_file_allocator(const MemoryAllocator *allocator)
 TEST(MmapFileAllocatorFactoryTest, empty_dir_gives_no_allocator)
 {
     MmapFileAllocatorFactory::instance().setup("");
-    auto allocator = MmapFileAllocatorFactory::instance().get_memory_allocator("foo");
+    auto allocator = MmapFileAllocatorFactory::instance().make_memory_allocator("foo");
     EXPECT_FALSE(allocator);
 }
 
 TEST(MmapFileAllocatorFactoryTest, nonempty_dir_gives_allocator)
 {
     MmapFileAllocatorFactory::instance().setup(basedir);
-    auto allocator0 = MmapFileAllocatorFactory::instance().get_memory_allocator("foo");
-    auto allocator1 = MmapFileAllocatorFactory::instance().get_memory_allocator("bar");
+    auto allocator0 = MmapFileAllocatorFactory::instance().make_memory_allocator("foo");
+    auto allocator1 = MmapFileAllocatorFactory::instance().make_memory_allocator("bar");
     EXPECT_TRUE(is_mmap_file_allocator(allocator0.get()));
     EXPECT_TRUE(is_mmap_file_allocator(allocator1.get()));
     vespalib::string allocator0_dir(basedir + "/0.foo");
diff --git a/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.cpp b/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.cpp
index 21f946263ef..a575c08309d 100644
--- a/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.cpp
+++ b/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.cpp
@@ -24,7 +24,7 @@ MmapFileAllocatorFactory::setup(const vespalib::string& dir_name)
 }
 
 std::unique_ptr<MemoryAllocator>
-MmapFileAllocatorFactory::get_memory_allocator(const vespalib::string& name)
+MmapFileAllocatorFactory::make_memory_allocator(const vespalib::string& name)
 {
     if (_dir_name.empty()) {
         return {};
diff --git a/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h b/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h
index 4687c614074..b2586787845 100644
--- a/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h
+++ b/vespalib/src/vespa/vespalib/util/mmap_file_allocator_factory.h
@@ -23,7 +23,7 @@ class MmapFileAllocatorFactory {
     MmapFileAllocatorFactory& operator=(const MmapFileAllocatorFactory &) = delete;
 public:
     void setup(const vespalib::string &dir_name);
-    virtual std::unique_ptr<MemoryAllocator> get_memory_allocator(const vespalib::string& name);
+    std::unique_ptr<MemoryAllocator> make_memory_allocator(const vespalib::string& name);
     
     static MmapFileAllocatorFactory& instance();
 };