Replace the dangerous stealBuffer method with a static one that requires std::move to make destruction more visible.

1 files changed, 4 insertions, 1 deletions

diff --git a/vespalib/src/vespa/vespalib/data/databuffer.h b/vespalib/src/vespa/vespalib/data/databuffer.h
index a520ecd58bd..e1c21661716 100644
--- a/vespalib/src/vespa/vespalib/data/databuffer.h
+++ b/vespalib/src/vespa/vespalib/data/databuffer.h
@@ -40,6 +40,7 @@ private:
     char          *_freept;
     Alloc          _buffer;
 
+    Alloc stealBuffer();
 public:
     typedef std::unique_ptr<DataBuffer> UP;
     DataBuffer(const DataBuffer &) = delete;
@@ -606,7 +607,9 @@ public:
      **/
     void swap(DataBuffer &other);
 
-    Alloc stealBuffer();
+    static Alloc stealBuffer(DataBuffer buf) {
+        return buf.stealBuffer();
+    }
 };
 
 } // namespace vespalib