ai min: DataStore & ObjAnywhere

Author: fchn289

src/obj_anywhere/DataStore.hpp

@@ -58,7 +58,7 @@ bool DataStore<aDataKey>::emplaceOK(const aDataKey& aKey, S_PTR<void> aData) noe
         }
         else
         {
-            if (key_data_S_.emplace(aKey, aData).second)
+            if (key_data_S_.emplace(aKey, std::move(aData)).second)
                 return true;
             else
             {
@@ -96,14 +96,11 @@ template<typename aDataKey>
 bool DataStore<aDataKey>::replaceOK(const aDataKey& aKey, S_PTR<void> aData) noexcept
 {
     try {
-        if (! aData) {
-            HID("(DataStore) erase key=" << typeid(aDataKey).name());
-            return key_data_S_.erase(aKey) > 0;
-        }
-        else {
-            key_data_S_[aKey] = aData;
-            return true;
-        }
+        if (! aData)
+            return emplaceOK(aKey, nullptr);
+
+        key_data_S_[aKey] = std::move(aData);
+        return true;
     } catch(...) {
         ERR("(DataStore) except->failed!!! key=" << typeid(aDataKey).name());
         return false;

src/obj_anywhere/ObjAnywhere.cpp

@@ -14,8 +14,7 @@ shared_ptr<DataStore<ObjName>> ObjAnywhere::name_obj_S_;
 // ***********************************************************************************************
 void ObjAnywhere::deinit() noexcept
 {
-    if (isInit())
-        name_obj_S_.reset();
+    name_obj_S_.reset();
 }
 
 // ***********************************************************************************************

src/obj_anywhere/ObjAnywhere.hpp

@@ -73,7 +73,7 @@ template<typename aObjType>
 bool ObjAnywhere::emplaceObjOK(S_PTR<aObjType> aObj, UniLog& oneLog, const ObjName& aObjName) noexcept
 {
     if (isInit())
-        return name_obj_S_->emplaceOK(aObjName, aObj);
+        return name_obj_S_->emplaceOK(aObjName, std::move(aObj));
 
     ERR("(ObjAnywhere) !!! Failed, pls call ObjAnywhere::init() beforehand.");
     return false;