Added rule of five and swap to CANDatabase

Author: xatavian

include/CANDatabase.h

@@ -39,6 +39,15 @@ class CANDatabase {
    */
   static CANDatabase fromString(const std::string& src_string);
 
+public:
+  using container_type = std::map<unsigned int, std::shared_ptr<CANFrame>>;
+  using str_container_type = std::map<std::string, std::shared_ptr<CANFrame>>;
+  
+  using iterator = container_type::iterator;
+  using const_iterator = container_type::const_iterator;
+  using reverse_iterator = container_type::reverse_iterator;
+  using const_reverse_iterator = container_type::const_reverse_iterator;
+
 public:
   /**
    * @brief Creates a CANDatabase object with no source file
@@ -51,6 +60,29 @@ class CANDatabase {
    */
   CANDatabase(const std::string& filename);
 
+  /**
+   * Creates a copy of the database: the individual frames are deep copied so there is no
+   * shared memory betwwen the two databases.
+   */
+  CANDatabase(const CANDatabase&);
+
+  /**
+   * @brief Makes a copy of the given database
+   * Note: the source database is passed-by-value for RVO
+   *       (see https://stackoverflow.com/a/3279550/8147455 for more info)
+   */
+  CANDatabase& operator=(CANDatabase);
+
+  /**
+   * @brief Moves a CANDatabase object. The CANFrame objects are NOT deep copied.
+   */
+  CANDatabase(CANDatabase&&);
+
+  /**
+   * @see CANDatabase(const CANDatabase&&)
+   */
+  CANDatabase& operator=(CANDatabase&&);
+
 public:
   /**
    * @brief Get the frame with the given frame name
@@ -83,6 +115,10 @@ class CANDatabase {
    */
   bool contains(const std::string& frame_name) const;
 
+  /**
+   * @brief Swaps the content of the two given databases
+   */
+  friend void swap(CANDatabase& first, CANDatabase& second);
   /**
    * @return File name of the source file if the database was constructed from a file.
    *         Otherwise, returns an empty string.
@@ -96,13 +132,6 @@ class CANDatabase {
      
      The iterators have a random order. */
 public:
-  using container_type = std::map<unsigned int, std::shared_ptr<CANFrame>>;
-  using str_container_type = std::map<std::string, std::shared_ptr<CANFrame>>;
-  using iterator = container_type::iterator;
-  using const_iterator = container_type::const_iterator;
-  using reverse_iterator = container_type::reverse_iterator;
-  using const_reverse_iterator = container_type::const_reverse_iterator;
-
   iterator begin();
   const_iterator begin() const;
   const_iterator cbegin() const;

src/models/CANDatabase.cpp

@@ -6,6 +6,32 @@
 CANDatabase::CANDatabase(const std::string& filename)
   : filename_(filename), strIndex_(), intIndex_() { }
 
+CANDatabase::CANDatabase(const CANDatabase& src):
+  filename_(src.filename_), strIndex_(), intIndex_() {
+
+  for (const auto& frame : src) {
+    auto copy = std::make_shared<CANFrame>(frame);
+    intIndex_.insert(std::make_pair(frame.second->can_id(), copy));
+    strIndex_.insert(std::make_pair(frame.second->name(), copy));
+  }
+}
+
+CANDatabase & CANDatabase::operator=(CANDatabase src) {
+  swap(*this, src);
+  return *this;
+}
+
+CANDatabase::CANDatabase(CANDatabase && src)
+  : filename_(), strIndex_(), intIndex_() {
+
+  swap(*this, src);
+}
+
+CANDatabase & CANDatabase::operator=(CANDatabase && src) {
+  swap(*this, src);
+  return *this;
+}
+
 const std::string& CANDatabase::filename() const {
   return filename_;
 }
@@ -161,3 +187,9 @@ void CANDatabase::clear() {
   intIndex_.clear();
   strIndex_.clear();
 }
+
+void swap(CANDatabase & first, CANDatabase & second) {
+  std::swap(first.intIndex_, second.intIndex_);
+  std::swap(first.strIndex_, second.strIndex_);
+  std::swap(first.filename_, second.filename_);
+}