Checkpoint 1

3 files changed, 14 insertions, 13 deletions

diff --git a/fnet/src/vespa/fnet/databuffer.cpp b/fnet/src/vespa/fnet/databuffer.cpp
index 3239dbf5087..913196d6e72 100644
--- a/fnet/src/vespa/fnet/databuffer.cpp
+++ b/fnet/src/vespa/fnet/databuffer.cpp
@@ -15,7 +15,7 @@ FNET_DataBuffer::FNET_DataBuffer(uint32_t len)
         len = 256;
 
     if (len > 0) {
-       DefaultAlloc(len).swap(_ownedBuf);
+       DefaultAlloc::create(len).swap(_ownedBuf);
        memset(_ownedBuf.get(), 0x55, len);
         _bufstart = static_cast<char *>(_ownedBuf.get());
         assert(_bufstart != NULL);
@@ -72,7 +72,7 @@ FNET_DataBuffer::Shrink(uint32_t newsize)
         return false;
     }
     
-    DefaultAlloc newBuf(newsize);
+    Alloc newBuf(DefaultAlloc::create(newsize));
     memset(newBuf.get(), 0x55, newsize);
     memcpy(newBuf.get(), _datapt, GetDataLen());
     _ownedBuf.swap(newBuf);
@@ -97,7 +97,7 @@ FNET_DataBuffer::Pack(uint32_t needbytes)
         while (bufsize - GetDataLen() < needbytes)
             bufsize *= 2;
 
-        DefaultAlloc newBuf(bufsize);
+        Alloc newBuf(DefaultAlloc::create(bufsize));
         memset(newBuf.get(), 0x55, bufsize);
         memcpy(newBuf.get(), _datapt, GetDataLen());
         _ownedBuf.swap(newBuf);
diff --git a/fnet/src/vespa/fnet/databuffer.h b/fnet/src/vespa/fnet/databuffer.h
index 23802d2ea90..8e4127d3b72 100644
--- a/fnet/src/vespa/fnet/databuffer.h
+++ b/fnet/src/vespa/fnet/databuffer.h
@@ -29,11 +29,12 @@
 class FNET_DataBuffer
 {
 private:
-    char          *_bufstart;
-    char          *_bufend;
-    char          *_datapt;
-    char          *_freept;
-    vespalib::DefaultAlloc _ownedBuf;
+    using Alloc = vespalib::alloc::Alloc;
+    char  *_bufstart;
+    char  *_bufend;
+    char  *_datapt;
+    char  *_freept;
+    Alloc  _ownedBuf;
 
     FNET_DataBuffer(const FNET_DataBuffer &);
     FNET_DataBuffer &operator=(const FNET_DataBuffer &);
diff --git a/fnet/src/vespa/fnet/frt/values.h b/fnet/src/vespa/fnet/frt/values.h
index 0c3b13b16f3..8ab8914d31f 100644
--- a/fnet/src/vespa/fnet/frt/values.h
+++ b/fnet/src/vespa/fnet/frt/values.h
@@ -72,12 +72,12 @@ public:
     class LocalBlob : public FRT_ISharedBlob
     {
     public:
-        LocalBlob(vespalib::DefaultAlloc data, uint32_t len) :
+        LocalBlob(vespalib::alloc::Alloc data, uint32_t len) :
             _data(std::move(data)),
             _len(len)
         { }
         LocalBlob(const char *data, uint32_t len) :
-            _data(len),
+            _data(vespalib::DefaultAlloc::create(len)),
             _len(len)
         {
             if (data != NULL) {
@@ -85,7 +85,7 @@ public:
             }
         }
         void addRef() override {}
-        void subRef() override { vespalib::DefaultAlloc().swap(_data); }
+        void subRef() override { vespalib::alloc::Alloc().swap(_data); }
         uint32_t getLen() override { return _len; }
         const char *getData() override { return static_cast<const char *>(_data.get()); }
         char *getInternalData() { return static_cast<char *>(_data.get()); }
@@ -93,7 +93,7 @@ public:
         LocalBlob(const LocalBlob &);
         LocalBlob &operator=(const LocalBlob &);
 
-        vespalib::DefaultAlloc _data;
+        vespalib::alloc::Alloc _data;
         uint32_t _len;
     };
 
@@ -439,7 +439,7 @@ public:
         _typeString[_numValues++] = FRT_VALUE_DATA;
     }
 
-    void AddData(vespalib::DefaultAlloc buf, uint32_t len)
+    void AddData(vespalib::alloc::Alloc buf, uint32_t len)
     {
         AddSharedData(new (_tub) LocalBlob(std::move(buf), len));
     }