Remove ExpressionNode::CP from interfaces.

1 files changed, 17 insertions, 3 deletions

diff --git a/vespalib/src/vespa/vespalib/util/memory.h b/vespalib/src/vespa/vespalib/util/memory.h
index d8bc1847321..d43190bd177 100644
--- a/vespalib/src/vespa/vespalib/util/memory.h
+++ b/vespalib/src/vespa/vespalib/util/memory.h
@@ -136,6 +136,13 @@ public:
     /** @brief destructor, calls free() on owned pointer */
     ~MallocAutoPtr() { cleanup(); }
 
+    MallocAutoPtr(MallocAutoPtr && rhs) : _p(rhs._p) { rhs._p = nullptr; }
+    MallocAutoPtr & operator = (MallocAutoPtr && rhs) {
+        cleanup();
+        std::swap(_p, rhs._p);
+        return *this;
+    }
+
     /**
      * @brief "copy" contructor
      *
@@ -288,9 +295,9 @@ public:
     void
     realloc(size_t sz)
     {
-	if (sz == 0) {
-	    cleanup();
-	} else {
+        if (sz == 0) {
+            cleanup();
+        } else {
             void *p = ::realloc(_p, sz);
             if (p != nullptr) {
                 _p = p;
@@ -326,6 +333,13 @@ public:
     /** @brief construct (from pointer) */
     CloneablePtr(T * p=nullptr) : _p(p) { }
 
+    CloneablePtr(CloneablePtr && rhs) noexcept : _p(rhs._p) { rhs._p = nullptr; }
+    CloneablePtr & operator = (CloneablePtr && rhs) noexcept {
+        cleanup();
+        std::swap(_p, rhs._p);
+        return *this;
+    }
+
     /** @brief destructor doing delete on owned pointer */
     ~CloneablePtr() { cleanup(); }