Merge pull request cms-sw#43337 from makortel/assignmentView

Remove explicit assignment operator from edm::View

Author: cmsbuild

DataFormats/Common/interface/View.h

@@ -46,9 +46,11 @@ namespace edm {
     std::unique_ptr<ViewBase> clone() const;
 
   protected:
-    ViewBase();
-    ViewBase(ViewBase const&);
-    ViewBase& operator=(ViewBase const&);
+    ViewBase() = default;
+    ViewBase(ViewBase const&) = default;
+    ViewBase(ViewBase&&) = default;
+    ViewBase& operator=(ViewBase const&) = default;
+    ViewBase& operator=(ViewBase&&) = default;
     virtual std::unique_ptr<ViewBase> doClone() const = 0;
     void swap(ViewBase&) {}  // Nothing to swap
   };
@@ -101,12 +103,8 @@ namespace edm {
     // infrastructure code.
     View(std::vector<void const*> const& pointers, FillViewHelperVector const& helpers, EDProductGetter const* getter);
 
-    ~View() override;
-
     void swap(View& other);
 
-    View& operator=(View const& rhs);
-
     size_type capacity() const;
 
     // Most non-const member functions not present.
@@ -191,9 +189,6 @@ namespace edm {
     }
   }
 
-  template <typename T>
-  View<T>::~View() {}
-
   template <typename T>
   inline void View<T>::swap(View& other) {
     this->ViewBase::swap(other);
@@ -294,13 +289,6 @@ namespace edm {
     return std::unique_ptr<ViewBase>{new View(*this)};
   }
 
-  template <typename T>
-  inline View<T>& View<T>::operator=(View<T> const& rhs) {
-    View<T> temp(rhs);
-    this->swap(temp);
-    return *this;
-  }
-
   template <typename T>
   inline bool operator==(View<T> const& lhs, View<T> const& rhs) {
     return lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin());

DataFormats/Common/src/View.cc

@@ -18,8 +18,4 @@ namespace edm {
     return p;
   }
 
-  ViewBase::ViewBase() {}
-
-  ViewBase::ViewBase(ViewBase const&) {}
-
 }  // namespace edm

DataFormats/Common/test/ptr_t.cppunit.cc

@@ -206,6 +206,9 @@ void testPtr::constructTest() {
     Ptr<Dummy> copyPtr(dummy2Ptr);
     CPPUNIT_ASSERT(dummy2Ptr.key() == copyPtr.key());
     CPPUNIT_ASSERT(dummy2Ptr.get() == static_cast<const Dummy*>(dummy2Ptr.get()));
+
+    Ptr<Dummy> movePtr(std::move(copyPtr));
+    CPPUNIT_ASSERT(dummy2Ptr.key() == movePtr.key());
   }
 }
 

DataFormats/Common/test/reftobaseprod_t.cppunit.cc

@@ -173,6 +173,10 @@ void testRefToBaseProd::constructTest() {
 
     CPPUNIT_ASSERT(dummyPtr2.id() == pid);
     compareTo(dummyPtr2, dummyContainer);
+
+    RefToBaseProd<Dummy> dummyPtr3(std::move(dummyPtr2));
+    CPPUNIT_ASSERT(dummyPtr3.id() == pid);
+    compareTo(dummyPtr3, dummyContainer);
   }
 }