Implemented move semantics for Config and Setting

Signed-off-by: David C. Manuelda <[email protected]>
hyperrealm · Oct 31, 2024 · 4d00bed · 4d00bed
1 parent e4c5d2c
commit 4d00bed
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/lib/libconfig.h++ b/lib/libconfig.h++
@@ -191,7 +191,8 @@ class LIBCONFIGXX_API Setting
   typedef SettingConstIterator const_iterator;
 
   public:
-
+  Setting(Setting&&) noexcept;
+  Setting& operator=(Setting&&) noexcept;
   virtual ~Setting();
 
   inline Type getType() const { return(_type); }
@@ -474,6 +475,8 @@ class LIBCONFIGXX_API Config
   };
 
   Config();
+  Config(Config&&) noexcept;
+  Config& operator=(Config&&) noexcept;
   virtual ~Config();
 
   void clear();
@@ -516,8 +519,8 @@ class LIBCONFIGXX_API Config
   inline void readFile(const std::string &filename)
   { readFile(filename.c_str()); }
 
-  void writeFile(const char *filename) const;
-  inline void writeFile(const std::string &filename) const
+  void writeFile(const char *filename);
+  inline void writeFile(const std::string &filename)
   { writeFile(filename.c_str()); }
 
   Setting & lookup(const char *path) const;

diff --git a/lib/libconfigcpp.c++ b/lib/libconfigcpp.c++
@@ -363,6 +363,22 @@ Config::Config()
   config_set_fatal_error_func(__fatal_error_func);
 }
 
+Config::Config(Config&& cfg) noexcept
+{
+  _config = cfg._config;
+  cfg._config = nullptr;
+}
+
+Config& Config::operator=(Config&& cfg) noexcept
+{
+  if (this != &cfg)
+  {
+	_config = cfg._config;
+	cfg._config = nullptr;
+  }
+  return *this;
+}
+
 // ---------------------------------------------------------------------------
 
 Config::~Config()
@@ -521,7 +537,7 @@ void Config::readFile(const char *filename)
 
 // ---------------------------------------------------------------------------
 
-void Config::writeFile(const char *filename) const
+void Config::writeFile(const char *filename)
 {
   if(! config_write_file(_config, filename))
     handleError();
@@ -689,6 +705,26 @@ Setting::Setting(config_setting_t *setting)
   }
 }
 
+Setting::Setting(Setting&& setting) noexcept
+{
+  _setting = setting._setting;
+  setting._setting = nullptr;
+  _type = std::move(setting._type);
+  _format = std::move(setting._format);
+}
+
+Setting& Setting::operator=(Setting&& setting) noexcept
+{
+  if (this != &setting)
+  {
+    _setting = setting._setting;
+    setting._setting = nullptr;
+    _type = std::move(setting._type);
+    _format = std::move(setting._format);
+  }
+  return *this;
+}
+
 // ---------------------------------------------------------------------------
 
 Setting::~Setting()