Remove ExpressionNode::CP from interfaces.

2 files changed, 5 insertions, 2 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.h b/staging_vespalib/src/vespa/vespalib/objects/identifiable.h
index 33c936afbd4..d5a51845c57 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.h
+++ b/staging_vespalib/src/vespa/vespalib/objects/identifiable.h
@@ -293,8 +293,7 @@ public:
      * @param operation component performing some operation
      *                  on the selected (sub-)objects
      **/
-    void select(const ObjectPredicate &predicate,
-                ObjectOperation &operation);
+    void select(const ObjectPredicate &predicate, ObjectOperation &operation);
 
     /**
      * Invoke @ref select on any member objects this object wants to
diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
index 617d631328b..557472b09ca 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
+++ b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
@@ -47,6 +47,10 @@ class IdentifiablePtr : public CloneablePtr<T>
 {
 public:
     IdentifiablePtr(const T &t) : CloneablePtr<T>(t.clone()) {}
+    IdentifiablePtr(IdentifiablePtr &&) = default;
+    IdentifiablePtr & operator = (IdentifiablePtr &&) = default;
+    IdentifiablePtr(const IdentifiablePtr &) = default;
+    IdentifiablePtr & operator = (const IdentifiablePtr &) = default;
     IdentifiablePtr(T * p=NULL) : CloneablePtr<T>(p) { }
     int cmp(const IdentifiablePtr<T> &rhs) const {
         const T *a = this->get();