wip

Author: nobody

include/class_loader/class_loader.h

@@ -75,13 +75,11 @@ std::string systemLibraryFormat(const std::string & library_name);
 class ClassLoader
 {
 public:
-#if __cplusplus >= 201103L
   template<typename Base>
   using DeleterType = std::function<void (Base *)>;
 
   template<typename Base>
   using UniquePtr = std::unique_ptr<Base, DeleterType<Base>>;
-#endif
 
   /**
    * @brief  Constructor for ClassLoader
@@ -125,7 +123,6 @@ class ClassLoader
     );
   }
 
-#if __cplusplus >= 201103L
   /// Generates an instance of loadable classes (i.e. class_loader).
   /**
    * It is not necessary for the user to call loadLibrary() as it will be
@@ -148,7 +145,6 @@ class ClassLoader
       std::bind(&ClassLoader::onPluginDeletion<Base>, this, std::placeholders::_1)
     );
   }
-#endif
 
   /// Generates an instance of loadable classes (i.e. class_loader).
   /**

test/CMakeLists.txt

@@ -6,12 +6,14 @@ add_library(${PROJECT_NAME}_TestPlugins1 EXCLUDE_FROM_ALL SHARED plugins1.cpp)
 target_include_directories(${PROJECT_NAME}_TestPlugins1
   PUBLIC "../include" ${console_bridge_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME}_TestPlugins1 ${PROJECT_NAME})
-class_loader_hide_library_symbols(${PROJECT_NAME}_TestPlugins1)
-
+# class_loader_hide_library_symbols(${PROJECT_NAME}_TestPlugins1)
+target_compile_definitions(${PROJECT_NAME}_TestPlugins1 PRIVATE "CLASS_LOADER_BUILDING_DLL")
+class_loader_hide_library_symbols(${PROJECT_NAME}_TestPlugins2)
 add_library(${PROJECT_NAME}_TestPlugins2 EXCLUDE_FROM_ALL SHARED plugins2.cpp)
 target_include_directories(${PROJECT_NAME}_TestPlugins2
   PUBLIC "../include" ${console_bridge_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME}_TestPlugins2 ${PROJECT_NAME})
+target_compile_definitions(${PROJECT_NAME}_TestPlugins2 PRIVATE "CLASS_LOADER_BUILDING_DLL")
 class_loader_hide_library_symbols(${PROJECT_NAME}_TestPlugins2)
 
 set(append_library_dirs "${CMAKE_CURRENT_BINARY_DIR}")
@@ -20,6 +22,7 @@ if(WIN32)
   set(append_library_dirs "${append_library_dirs}/$<CONFIG>")
 endif()
 
+message(WARNING "append_library_dirs: ${append_library_dirs}")
 ament_add_gtest(${PROJECT_NAME}_utest utest.cpp
   APPEND_LIBRARY_DIRS "${append_library_dirs}"
 )
@@ -40,8 +43,8 @@ endif()
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-if(false)
-# if(COMPILER_SUPPORTS_CXX11)
+# if(false)
+if(COMPILER_SUPPORTS_CXX11)
   find_package(Boost REQUIRED COMPONENTS thread)
   ament_add_gtest(${PROJECT_NAME}_unique_ptr_test unique_ptr_test.cpp)
   if(TARGET ${PROJECT_NAME}_unique_ptr_test)

test/utest.cpp

@@ -74,7 +74,7 @@ TEST(ClassLoaderTest, nonExistentPlugin)
     }
 
     obj->saySomething();
-  } catch (const class_loader::CreateClassException & e) {
+  } catch (const class_loader::CreateClassException &) {
     SUCCEED();
     return;
   } catch (...) {
@@ -88,7 +88,7 @@ TEST(ClassLoaderTest, nonExistentLibrary)
 {
   try {
     class_loader::ClassLoader loader1("libDoesNotExist.so", false);
-  } catch (const class_loader::LibraryLoadException & e) {
+  } catch (const class_loader::LibraryLoadException &) {
     SUCCEED();
     return;
   } catch (...) {
@@ -115,7 +115,7 @@ TEST(ClassLoaderTest, invalidBase)
     } else {
       FAIL() << "Class not available for correct base class.";
     }
-  } catch (const class_loader::LibraryLoadException & e) {
+  } catch (const class_loader::LibraryLoadException &) {
     FAIL() << "Unexpected exception";
   } catch (...) {
     FAIL() << "Unexpected and unknown exception caught.\n";
@@ -161,7 +161,7 @@ TEST(ClassLoaderTest, threadSafety)
     loader1.unloadLibrary();
     ASSERT_FALSE(loader1.isLibraryLoaded());
 
-  } catch (const class_loader::ClassLoaderException & ex) {
+  } catch (const class_loader::ClassLoaderException &) {
     FAIL() << "Unexpected ClassLoaderException.";
   } catch (...) {
     FAIL() << "Unknown exception.";
@@ -194,7 +194,7 @@ TEST(ClassLoaderTest, loadRefCountingNonLazy)
     ASSERT_TRUE(loader1.isLibraryLoaded());
 
     return;
-  } catch (const class_loader::ClassLoaderException & e) {
+  } catch (const class_loader::ClassLoaderException &) {
     FAIL() << "Unexpected exception.\n";
   } catch (...) {
     FAIL() << "Unknown exception caught.\n";
@@ -235,7 +235,7 @@ TEST(ClassLoaderTest, loadRefCountingLazy)
     ASSERT_TRUE(loader1.isLibraryLoaded());
 
     return;
-  } catch (const class_loader::ClassLoaderException & e) {
+  } catch (const class_loader::ClassLoaderException &) {
     FAIL() << "Unexpected exception.\n";
   } catch (...) {
     FAIL() << "Unknown exception caught.\n";