iox-#1934 Alias invoke_result to correct implementation based on C++ …

…version
eclipse-iceoryx · Apr 3, 2023 · 40692fe · 40692fe
1 parent 207d419
commit 40692fe
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -74,6 +74,7 @@
 - Fix potential memory leak in `iox::stack` [\#1893](https://github.com/eclipse-iceoryx/iceoryx/issues/1893)
 - Make `MAX_USER_NAME_LENGTH` and `MAX_GROUP_NAME_LENGTH` platform-dependent [\#1919](https://github.com/eclipse-iceoryx/iceoryx/issues/1919)
 - Fix milliseconds in log timestamps [\#1932](https://github.com/eclipse-iceoryx/iceoryx/issues/1932)
+- Alias `invoke_result` to correct implementation based on C++ version [\#1934](https://github.com/eclipse-iceoryx/iceoryx/issues/1934)
 
 **Refactoring:**
 

diff --git a/iceoryx_platform/linux/include/iceoryx_platform/platform_settings.hpp b/iceoryx_platform/linux/include/iceoryx_platform/platform_settings.hpp
@@ -41,8 +41,13 @@ constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/tmp/";
 constexpr uint64_t MAX_USER_NAME_LENGTH = 32;
 constexpr uint64_t MAX_GROUP_NAME_LENGTH = 32;
 
+#if __cplusplus >= 201703L
+template <typename C, typename... Cargs>
+using invoke_result = std::invoke_result<C(Cargs...)>;
+#else
 template <typename C, typename... Cargs>
 using invoke_result = std::result_of<C(Cargs...)>;
+#endif
 } // namespace platform
 } // namespace iox
 

diff --git a/iceoryx_platform/mac/include/iceoryx_platform/platform_settings.hpp b/iceoryx_platform/mac/include/iceoryx_platform/platform_settings.hpp
@@ -42,8 +42,13 @@ constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/tmp/";
 constexpr uint64_t MAX_USER_NAME_LENGTH = 32;
 constexpr uint64_t MAX_GROUP_NAME_LENGTH = 16;
 
+#if __cplusplus >= 201703L
 template <typename C, typename... Cargs>
-using invoke_result = std::invoke_result<C, Cargs...>;
+using invoke_result = std::invoke_result<C(Cargs...)>;
+#else
+template <typename C, typename... Cargs>
+using invoke_result = std::result_of<C(Cargs...)>;
+#endif
 
 } // namespace platform
 } // namespace iox

diff --git a/iceoryx_platform/qnx/include/iceoryx_platform/platform_settings.hpp b/iceoryx_platform/qnx/include/iceoryx_platform/platform_settings.hpp
@@ -40,8 +40,13 @@ constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/var/lock/";
 constexpr uint64_t MAX_USER_NAME_LENGTH = 32;
 constexpr uint64_t MAX_GROUP_NAME_LENGTH = 16;
 
+#if __cplusplus >= 201703L
+template <typename C, typename... Cargs>
+using invoke_result = std::invoke_result<C(Cargs...)>;
+#else
 template <typename C, typename... Cargs>
 using invoke_result = std::result_of<C(Cargs...)>;
+#endif
 } // namespace platform
 } // namespace iox
 

diff --git a/iceoryx_platform/unix/include/iceoryx_platform/platform_settings.hpp b/iceoryx_platform/unix/include/iceoryx_platform/platform_settings.hpp
@@ -41,8 +41,13 @@ constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/tmp/";
 constexpr uint64_t MAX_USER_NAME_LENGTH = 32;
 constexpr uint64_t MAX_GROUP_NAME_LENGTH = 16;
 
+#if __cplusplus >= 201703L
 template <typename C, typename... Cargs>
-using invoke_result = std::invoke_result<C, Cargs...>;
+using invoke_result = std::invoke_result<C(Cargs...)>;
+#else
+template <typename C, typename... Cargs>
+using invoke_result = std::result_of<C(Cargs...)>;
+#endif
 
 } // namespace platform
 } // namespace iox

diff --git a/iceoryx_platform/win/include/iceoryx_platform/platform_settings.hpp b/iceoryx_platform/win/include/iceoryx_platform/platform_settings.hpp
@@ -43,8 +43,13 @@ constexpr uint64_t IOX_MAX_PATH_LENGTH = 255U;
 constexpr uint64_t MAX_USER_NAME_LENGTH = 32;
 constexpr uint64_t MAX_GROUP_NAME_LENGTH = 16;
 
+#if __cplusplus >= 201703L
 template <typename C, typename... Cargs>
-using invoke_result = std::invoke_result<C, Cargs...>;
+using invoke_result = std::invoke_result<C(Cargs...)>;
+#else
+template <typename C, typename... Cargs>
+using invoke_result = std::result_of<C(Cargs...)>;
+#endif
 
 namespace win32
 {