some fixes

Signed-off-by: ahcorde <[email protected]>

Author: ahcorde

include/class_loader/class_loader.hpp

@@ -122,7 +122,8 @@ class ClassLoader : public std::enable_shared_from_this<ClassLoader>
    * @return A std::shared_ptr<Base> to newly created plugin object
    */
   template<class Base>
-  std::shared_ptr<Base> createInstance(const std::string & derived_class_name,
+  std::shared_ptr<Base> createInstance(
+    const std::string & derived_class_name,
     bool is_shared_ptr = false)
   {
     if (is_shared_ptr) {
@@ -152,19 +153,20 @@ class ClassLoader : public std::enable_shared_from_this<ClassLoader>
    * @return A std::unique_ptr<Base> to newly created plugin object.
    */
   template<class Base>
-  UniquePtr<Base> createUniqueInstance(const std::string & derived_class_name,
+  UniquePtr<Base> createUniqueInstance(
+    const std::string & derived_class_name,
     bool is_shared_ptr = false)
   {
     Base * raw = createRawInstance<Base>(derived_class_name, true);
     if (is_shared_ptr) {
       return std::unique_ptr<Base, DeleterType<Base>>(
         raw,
-        std::bind(&ClassLoader::onPluginDeletion<Base>, this, std::placeholders::_1)
+        std::bind(&ClassLoader::onPluginDeletion<Base>, shared_from_this(), std::placeholders::_1)
       );
     } else {
       return std::unique_ptr<Base, DeleterType<Base>>(
         raw,
-        std::bind(&ClassLoader::onPluginDeletion<Base>, shared_from_this(), std::placeholders::_1)
+        std::bind(&ClassLoader::onPluginDeletion<Base>, this, std::placeholders::_1)
       );
     }
   }

include/class_loader/multi_library_class_loader.hpp

@@ -154,7 +154,7 @@ class CLASS_LOADER_PUBLIC MultiLibraryClassLoader
               "Make sure that the library exists and was explicitly loaded through "
               "MultiLibraryClassLoader::loadLibrary()");
     }
-    return loader->createUniqueInstance<Base>(class_name);
+    return loader->createUniqueInstance<Base>(class_name, true);
   }
 
   /// Creates an instance of an object of given class name with ancestor class Base
@@ -321,7 +321,8 @@ class CLASS_LOADER_PUBLIC MultiLibraryClassLoader
    * @param library_path - the library from which we want to create the plugin
    * @return A pointer to the ClassLoader*, == nullptr if not found
    */
-  std::shared_ptr<class_loader::ClassLoader> getClassLoaderForLibrary(const std::string & library_path);
+  std::shared_ptr<class_loader::ClassLoader> getClassLoaderForLibrary(
+    const std::string & library_path);
 
   /// Gets a handle to the class loader corresponding to a specific class.
   /**

src/multi_library_class_loader.cpp

@@ -30,6 +30,7 @@
 #include "class_loader/multi_library_class_loader.hpp"
 
 #include <cstddef>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <vector>