cmake|Plugin|Expected|test: Fix C++17 compilation issues

taminob · Mar 14, 2024 · b6b2d86 · b6b2d86
1 parent 1eed902
commit b6b2d86
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,8 +62,6 @@ if(${PPPLUGIN_ENABLE_CPP17_COMPATIBILITY})
   set(CMAKE_CXX_STANDARD 17)
   # TODO: generate C++17 compatible header files instead
   add_definitions("-DPPPLUGIN_CPP17_COMPATIBILITY")
-  target_link_libraries(${LIBRARY_TARGET_SHARED} fmt::fmt)
-  target_link_libraries(${LIBRARY_TARGET_STATIC} fmt::fmt)
 else()
   set(CMAKE_CXX_STANDARD 20)
 endif()

diff --git a/include/expected.h b/include/expected.h
@@ -41,8 +41,15 @@ class Expected {
     template <typename U, typename V,
         typename = std::enable_if_t<std::is_convertible_v<U, T> && std::is_convertible_v<V, E>>>
     constexpr Expected(const Expected<U, V>& rhs);
-    template <typename U, typename V,
-        typename = std::enable_if_t<std::is_nothrow_convertible_v<U, T> && std::is_nothrow_convertible_v<V, E>>>
+    template <typename U, typename V
+#ifdef PPPLUGIN_CPP17_COMPATIBILITY
+        ,
+        typename = std::enable_if_t<std::is_convertible_v<U, T> && std::is_convertible_v<V, E>>
+#else
+        ,
+        typename = std::enable_if_t<std::is_nothrow_convertible_v<U, T> && std::is_nothrow_convertible_v<V, E>>
+#endif // PPPLUGIN_CPP17_COMPATIBILITY
+        >
     constexpr Expected(Expected<U, V>&& rhs) noexcept;
     constexpr Expected& operator=(const Expected&) = default;
     constexpr Expected& operator=(Expected&&) noexcept = default;

diff --git a/include/plugin.h b/include/plugin.h
@@ -42,10 +42,10 @@ class GenericPlugin {
 
     GenericPlugin() = default;
     template <typename P,
-        std::enable_if_t<(std::is_base_of_v<Plugins, std::remove_cvref_t<P>> || ...), bool> = true>
+        std::enable_if_t<(std::is_base_of_v<Plugins, std::remove_cv_t<std::remove_reference_t<P>>> || ...), bool> = true>
     GenericPlugin(P&& plugin); // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
 
-    virtual ~GenericPlugin() = default;
+    ~GenericPlugin() = default;
     GenericPlugin(const GenericPlugin&) = default;
     GenericPlugin(GenericPlugin&&) noexcept = default;
     GenericPlugin& operator=(const GenericPlugin&) = default;
@@ -68,7 +68,7 @@ using Plugin = GenericPlugin<CPlugin, CppPlugin, LuaPlugin, PythonPlugin, NoopPl
 
 template <typename... Plugins>
 template <typename P,
-    std::enable_if_t<(std::is_base_of_v<Plugins, std::remove_cvref_t<P>> || ...), bool>>
+    std::enable_if_t<(std::is_base_of_v<Plugins, std::remove_cv_t<std::remove_reference_t<P>>> || ...), bool>>
 // NOLINTNEXTLINE(bugprone-forwarding-reference-overload); enable_if condition prevents hiding copy/move ctors
 GenericPlugin<Plugins...>::GenericPlugin(P&& plugin)
     : plugin_(std::forward<P>(plugin))

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,6 +10,9 @@ target_link_libraries(
   PUBLIC Boost::python
   PUBLIC Python::Python
   PRIVATE ${LUA_LIBRARIES})
+if(${PPPLUGIN_ENABLE_CPP17_COMPATIBILITY})
+  target_link_libraries(${LIBRARY_TARGET} PUBLIC fmt::fmt)
+endif()
 target_include_directories(
   ${LIBRARY_TARGET}
   PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>

diff --git a/test/expected_tests.cpp b/test/expected_tests.cpp
@@ -1,5 +1,5 @@
 #include "expected.h"
-#include "test/test_types.h"
+#include "test_types.h"
 #include "test_helper.h"
 
 #include <gmock/gmock.h>