iox-eclipse-iceoryx#220 replace cxx::enable_if_t with std::enable_if_t

Signed-off-by: Mathias Kraus <[email protected]>
ApexAI · Nov 23, 2020 · 8c0c3c2 · 8c0c3c2
1 parent d58d7de
commit 8c0c3c2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.hpp
@@ -151,11 +151,11 @@ class PortManager
     void addEntryToServiceRegistry(const capro::IdString& service, const capro::IdString& instance) noexcept;
     void removeEntryFromServiceRegistry(const capro::IdString& service, const capro::IdString& instance) noexcept;
 
-    template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>* = nullptr>
+    template <typename T, std::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>* = nullptr>
     cxx::optional<ProcessName_t> doesViolateCommunicationPolicy(const capro::ServiceDescription& service) const
         noexcept;
 
-    template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>* = nullptr>
+    template <typename T, std::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>* = nullptr>
     cxx::optional<ProcessName_t> doesViolateCommunicationPolicy(const capro::ServiceDescription& service
                                                                 [[gnu::unused]]) const noexcept;
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.inl b/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.inl
@@ -18,7 +18,7 @@ namespace iox
 {
 namespace roudi
 {
-template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>*>
+template <typename T, std::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>*>
 inline cxx::optional<ProcessName_t>
 PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& service) const noexcept
 {
@@ -34,7 +34,7 @@ PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& ser
     return cxx::nullopt;
 }
 
-template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>*>
+template <typename T, std::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>*>
 inline cxx::optional<ProcessName_t> PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& service
                                                                                 [[gnu::unused]]) const noexcept
 {

diff --git a/iceoryx_posh/include/iceoryx_posh/roudi/port_pool.hpp b/iceoryx_posh/include/iceoryx_posh/roudi/port_pool.hpp
@@ -95,13 +95,13 @@ class PortPool
                       const ProcessName_t& applicationName,
                       const mepoo::MemoryInfo& memoryInfo = mepoo::MemoryInfo()) noexcept;
 
-    template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>* = nullptr>
+    template <typename T, std::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>* = nullptr>
     iox::popo::SubscriberPortData* constructSubscriber(const capro::ServiceDescription& serviceDescription,
                                                        const uint64_t& historyRequest,
                                                        const ProcessName_t& applicationName,
                                                        const mepoo::MemoryInfo& memoryInfo) noexcept;
 
-    template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>* = nullptr>
+    template <typename T, std::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>* = nullptr>
     iox::popo::SubscriberPortData* constructSubscriber(const capro::ServiceDescription& serviceDescription,
                                                        const uint64_t& historyRequest,
                                                        const ProcessName_t& applicationName,

diff --git a/iceoryx_posh/include/iceoryx_posh/roudi/port_pool.inl b/iceoryx_posh/include/iceoryx_posh/roudi/port_pool.inl
@@ -18,7 +18,7 @@ namespace iox
 {
 namespace roudi
 {
-template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>*>
+template <typename T, std::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>*>
 inline iox::popo::SubscriberPortData* PortPool::constructSubscriber(const capro::ServiceDescription& serviceDescription,
                                                                     const uint64_t& historyRequest,
                                                                     const ProcessName_t& applicationName,
@@ -31,7 +31,7 @@ inline iox::popo::SubscriberPortData* PortPool::constructSubscriber(const capro:
                                                           memoryInfo);
 }
 
-template <typename T, cxx::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>*>
+template <typename T, std::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>*>
 inline iox::popo::SubscriberPortData* PortPool::constructSubscriber(const capro::ServiceDescription& serviceDescription,
                                                                     const uint64_t& historyRequest,
                                                                     const ProcessName_t& applicationName,

diff --git a/iceoryx_utils/include/iceoryx_utils/cxx/function_ref.hpp b/iceoryx_utils/include/iceoryx_utils/cxx/function_ref.hpp
@@ -71,8 +71,8 @@ class function_ref<ReturnType(ArgTypes...)>
     /// @brief Creates a function_ref with a callable whose lifetime has to be longer than function_ref
     /// @param[in] callable that is not a function_ref
     template <typename CallableType,
-              typename = enable_if_t<not_same<CallableType, function_ref>::value>,
-              typename = enable_if_t<is_invocable<CallableType, ArgTypes...>::value>>
+              typename = std::enable_if_t<not_same<CallableType, function_ref>::value>,
+              typename = std::enable_if_t<is_invocable<CallableType, ArgTypes...>::value>>
     function_ref(CallableType&& callable) noexcept;
 
     function_ref(function_ref&& rhs) noexcept;

diff --git a/iceoryx_utils/include/iceoryx_utils/cxx/type_traits.hpp b/iceoryx_utils/include/iceoryx_utils/cxx/type_traits.hpp
@@ -63,13 +63,6 @@ struct has_signature<Callable,
 {
 };
 
-///
-/// @brief enable_if helper type
-/// @note Remove once switched to C++14
-///
-template <bool B, class T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
 ///
 /// @brief Negation of is_same
 ///