Remove the XXXFactory indirection. Just use static method on Alloc.

2 files changed, 10 insertions, 10 deletions

diff --git a/vespalib/src/tests/alloc/alloc_test.cpp b/vespalib/src/tests/alloc/alloc_test.cpp
index c0f732cf9da..8a1049f2784 100644
--- a/vespalib/src/tests/alloc/alloc_test.cpp
+++ b/vespalib/src/tests/alloc/alloc_test.cpp
@@ -48,13 +48,13 @@ void
 Test::testBasic()
 {
     {
-        Alloc h = HeapAllocFactory::create(100);
+        Alloc h = Alloc::allocHeap(100);
         EXPECT_EQUAL(100u, h.size());
         EXPECT_TRUE(h.get() != nullptr);
     }
     {
-        EXPECT_EXCEPTION(AlignedHeapAllocFactory::create(100, 7), IllegalArgumentException, "AlignedHeapAllocFactory::create(100, 7) does not support 7 alignment");
-        Alloc h = AlignedHeapAllocFactory::create(100, 1024);
+        EXPECT_EXCEPTION(Alloc::allocAlignedHeap(100, 7), IllegalArgumentException, "Alloc::allocAlignedHeapAlloc(100, 7) does not support 7 alignment");
+        Alloc h = Alloc::allocAlignedHeapAlloc(100, 1024);
         EXPECT_EQUAL(100u, h.size());
         EXPECT_TRUE(h.get() != nullptr);
     }
@@ -64,7 +64,7 @@ Test::testBasic()
         EXPECT_TRUE(h.get() != nullptr);
     }
     {
-        Alloc a = HeapAllocFactory::create(100), b = HeapAllocFactory::create(200);
+        Alloc a = Alloc::allocHeap(100), b = Alloc::allocHeap(200);
         testSwap(a, b);
     }
     {
@@ -72,17 +72,17 @@ Test::testBasic()
         testSwap(a, b);
     }
     {
-        Alloc a = AlignedHeapAllocFactory::create(100, 1024), b = AlignedHeapAllocFactory::create(200, 1024);
+        Alloc a = Alloc::allocAlignedHeap(100, 1024), b = Alloc::allocAlignedHeap(200, 1024);
         testSwap(a, b);
     }
     {
-        Alloc a = HeapAllocFactory::create(100);
+        Alloc a = Alloc::allocHeap(100);
         Alloc b = MMapAllocFactory::create(200);
         testSwap(a, b);
     }
     {
-        Alloc a = HeapAllocFactory::create(100);
-        Alloc b = HeapAllocFactory::create(100);
+        Alloc a = Alloc::allocHeap(100);
+        Alloc b = Alloc::allocHeap(100);
         a = std::move(b);
         EXPECT_TRUE(b.get() == nullptr);
     }
diff --git a/vespalib/src/tests/alloc/allocate_and_core.cpp b/vespalib/src/tests/alloc/allocate_and_core.cpp
index f0a0669eb42..63718de5ee4 100644
--- a/vespalib/src/tests/alloc/allocate_and_core.cpp
+++ b/vespalib/src/tests/alloc/allocate_and_core.cpp
@@ -6,9 +6,9 @@ using namespace vespalib::alloc;
 int main(int argc, char *argv[]) {
     (void) argc;
     (void) argv;
-    Alloc small(MMapAllocFactory::create(0x400000)); //4M
+    Alloc small(Alloc::allocMMap(0x400000)); //4M
     memset(small.get(), 0x55, small.size());
-    Alloc large(MMapAllocFactory::create(0x4000000)); //640M
+    Alloc large(Alloc::allocMMap(0x4000000)); //640M
     memset(large.get(), 0x66, large.size());
     assert(false);
 }