FIX | some bugs

Author: xiadnoring

CMakeLists.txt

@@ -1061,7 +1061,7 @@ if (MANAPIHTTP_BUILD_METHOD STREQUAL "conan")
 
     if (MANAPIHTTP_ZSTD_DEPENDENCY)
         target_link_libraries(${PROJECT_NAME} PUBLIC ${zstd_COMPONENT_NAMES})
-    endif ()
+    endqif ()
 
     if (MANAPIHTTP_NGHTTP2_DEPENDENCY)
         target_link_libraries(${PROJECT_NAME} PUBLIC libnghttp2::libnghttp2)

include/cache/ManapiLRU.hpp

@@ -36,9 +36,17 @@ namespace manapi {
         }
 
         void put (const K &key, const V &value, std::size_t weight) {
+            iput(key, V(value), weight);
+        }
+
+        void put (const K &key, V &&value, std::size_t weight) {
+            iput(key, std::forward<V>(value), weight);
+        }
+
+        void iput (const K &key, V &&value, std::size_t weight) {
             auto it = this->m_items.find(key);
             if (it == this->m_items.end()) {
-                this->m_list.push_front(key_value_pair_t (key, value));
+                this->m_list.push_front(key_value_pair_t (key, std::forward<V>(value)));
                 try {
                     item_t item (this->m_list.begin(), weight);
                     this->m_items.insert({key, std::move(item)});
@@ -49,7 +57,7 @@ namespace manapi {
                 }
             }
             else {
-                it->second.item->second = value; // malloc can be only here
+                it->second.item->second = std::forward<V>(value); // malloc can be only here
 
                 std::unique_ptr<chain_item<key_value_pair_t>> un;
                 this->m_used -= it->second.weight;

include/cache/ManapiTL.hpp

@@ -22,8 +22,16 @@ namespace manapi {
         }
 
         void put (const K &key, const V &value, std::chrono::milliseconds duration) {
+            this->iput(K(key), V(value), duration);
+        }
+
+        void put (const K &key, V &&value, std::chrono::milliseconds duration) {
+            this->iput(key, std::forward<V>(value), duration);
+        }
+
+        void iput (const K &key, V &&value, std::chrono::milliseconds duration) {
             this->cleanup();
-            auto id = std::make_pair(std::chrono::steady_clock::now() + duration, value);
+            auto id = std::make_pair(std::chrono::steady_clock::now() + duration, std::forward<decltype(value)>(value));
             auto it = this->m_data.insert({key, id});
             if (!it.second) {
                 this->m_sorted.erase(std::make_pair(it.first->second.first, it.first->first));

include/std/ManapiScopePtr.hpp

@@ -10,7 +10,7 @@ namespace manapi {
         bool own;
 
     public:
-        explicit scope_ptr(T* p = nullptr, bool ownership = true)
+        scope_ptr(T* p = nullptr, bool ownership = true)
             : ptr(p), own(ownership) {}
 
         ~scope_ptr() {
@@ -31,13 +31,14 @@ namespace manapi {
 
         scope_ptr& operator=(scope_ptr&& other) MANAPIHTTP_NOEXCEPT {
             if (this != &other) {
-                if (this->own) {
-                    delete this->ptr;
-                }
-                this->ptr = other.ptr;
-                this->own = other.own;
+                auto ptrn = other.ptr;
+                auto ownn = other.own;
                 other.ptr = nullptr;
                 other.own = false;
+                if (this->own)
+                    delete this->ptr;
+                this->ptr = ptrn;
+                this->own = ownn;
             }
             return *this;
         }