Explicitly allow move semantics with ParameterSet

ParameterSet and its internals now explicitly allow copy and move.
cms-sw · Aug 31, 2018 · 4bec48b · 4bec48b
1 parent 6e2e834
commit 4bec48b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 30 deletions.
diff --git a/FWCore/ParameterSet/interface/Entry.h b/FWCore/ParameterSet/interface/Entry.h
@@ -160,7 +160,11 @@ namespace edm {
     Entry(std::string const& name, std::string const& type,
           std::vector<std::string> const& value, bool is_tracked);
 
-    ~Entry();
+    ~Entry() = default;
+    Entry(Entry const&) = default;
+    Entry(Entry&&) = default;
+    Entry& operator=(Entry const&) = default;
+    Entry& operator=(Entry&&) = default;
     // encode
 
     std::string toString() const;

diff --git a/FWCore/ParameterSet/interface/ParameterSet.h b/FWCore/ParameterSet/interface/ParameterSet.h
@@ -48,12 +48,11 @@ namespace edm {
     // construct from coded string.
     explicit ParameterSet(std::string const& rep);
 
-    ~ParameterSet();
-
-    // instantiate in this library, so these methods don't cause code bloat
-    ParameterSet(ParameterSet const& other);
-
-    ParameterSet& operator=(ParameterSet const& other);
+    ~ParameterSet() = default;
+    ParameterSet(ParameterSet const& other) = default;
+    ParameterSet(ParameterSet&& other) = default;
+    ParameterSet& operator=(ParameterSet const& other) = default;
+    ParameterSet& operator=(ParameterSet&& other) = default;
 
     void swap(ParameterSet& other);
 

diff --git a/FWCore/ParameterSet/interface/ParameterSetEntry.h b/FWCore/ParameterSet/interface/ParameterSetEntry.h
@@ -27,7 +27,11 @@ namespace edm {
     ParameterSetEntry(ParameterSetID const& id, bool isTracked);
     explicit ParameterSetEntry(std::string const& rep);
 
-    ~ParameterSetEntry();
+    ~ParameterSetEntry() = default;
+    ParameterSetEntry(ParameterSetEntry const&) = default;
+    ParameterSetEntry(ParameterSetEntry&&) = default;
+    ParameterSetEntry& operator=(ParameterSetEntry const&) = default;
+    ParameterSetEntry& operator=(ParameterSetEntry&&) = default;
 
     std::string toString() const;
     void toString(std::string& result) const;

diff --git a/FWCore/ParameterSet/interface/VParameterSetEntry.h b/FWCore/ParameterSet/interface/VParameterSetEntry.h
@@ -27,7 +27,11 @@ namespace edm {
     VParameterSetEntry(std::vector<ParameterSet> const& vpset, bool isTracked);
     VParameterSetEntry(std::string const& rep);
 
-    ~VParameterSetEntry();
+    ~VParameterSetEntry() = default;
+    VParameterSetEntry(VParameterSetEntry const&) = default;
+    VParameterSetEntry(VParameterSetEntry&&) = default;
+    VParameterSetEntry& operator=(VParameterSetEntry const&) = default;
+    VParameterSetEntry& operator=(VParameterSetEntry&&) = default;
 
     std::string toString() const;
     void toString(std::string& result) const;

diff --git a/FWCore/ParameterSet/src/Entry.cc b/FWCore/ParameterSet/src/Entry.cc
@@ -78,8 +78,6 @@ namespace edm {
   static pset::TypeTrans const sTypeTranslations;
   typedef std::map<std::string, char> Type2Code;
 
-  Entry::~Entry() {}
-
 // ----------------------------------------------------------------------
 // consistency-checker
 // ----------------------------------------------------------------------

diff --git a/FWCore/ParameterSet/src/ParameterSet.cc b/FWCore/ParameterSet/src/ParameterSet.cc
@@ -89,8 +89,6 @@ namespace edm {
     }
   }
 
-  ParameterSet::~ParameterSet() {}
-
   void
   ParameterSet::registerFromString(std::string const& rep) {
     // from coded string.  Will cause registration
@@ -107,19 +105,6 @@ namespace edm {
     return ParameterSetID(newDigest.digest().toString());
   }
 
-  ParameterSet::ParameterSet(ParameterSet const& other)
-  : tbl_(other.tbl_),
-    psetTable_(other.psetTable_),
-    vpsetTable_(other.vpsetTable_),
-    id_(other.id_) {
-  }
-
-  ParameterSet& ParameterSet::operator=(ParameterSet const& other) {
-    ParameterSet temp(other);
-    swap(temp);
-    return *this;
-  }
-
   void ParameterSet::copyForModify(ParameterSet const& other) {
     ParameterSet temp(other);
     swap(temp);

diff --git a/FWCore/ParameterSet/src/ParameterSetEntry.cc b/FWCore/ParameterSet/src/ParameterSetEntry.cc
@@ -44,8 +44,6 @@ namespace edm {
     theID_.swap(newID);
   }
 
-  ParameterSetEntry::~ParameterSetEntry() {}
-
   void
   ParameterSetEntry::toString(std::string& result) const {
     result += isTracked() ? "+Q(" : "-Q(";

diff --git a/FWCore/ParameterSet/src/VParameterSetEntry.cc b/FWCore/ParameterSet/src/VParameterSetEntry.cc
@@ -39,8 +39,6 @@ namespace edm {
     }
   }
 
-  VParameterSetEntry::~VParameterSetEntry() {}
-
   void
   VParameterSetEntry::toString(std::string& result) const {
     assert(theIDs_);