Merge pull request #2501 from ekxide/iox-2499-cxx-14-for-hoofs-subset

iox-#2499: C++14 support for 'iceoryx_hoofs' subset

Author: elBoberido

iceoryx_hoofs/BUILD.bazel

@@ -22,6 +22,7 @@ configure_file(
     src = "cmake/iceoryx_hoofs_deployment.hpp.in",
     out = "generated/include/iox/iceoryx_hoofs_deployment.hpp",
     config_constants = {
+        "IOX_HOOFS_SUBSET": "0",
         "IOX_MAX_NAMED_PIPE_MESSAGE_SIZE": "4096",
         "IOX_MAX_NAMED_PIPE_NUMBER_OF_MESSAGES": "10",
         # FIXME: for values see "iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake" ... for now some nice defaults

iceoryx_hoofs/CMakeLists.txt

@@ -103,6 +103,12 @@ iox_add_library(
         posix/vocabulary/source/user_name.cpp
 )
 
+if(IOX_USE_HOOFS_SUBSET_ONLY)
+    set(IOX_HOOFS_SUBSET 1)
+else()
+    set(IOX_HOOFS_SUBSET 0)
+endif()
+
 if(NOT IOX_USE_HOOFS_SUBSET_ONLY)
     target_sources(
         iceoryx_hoofs

iceoryx_hoofs/cmake/iceoryx_hoofs_deployment.hpp.in

@@ -19,6 +19,8 @@
 
 #include "iox/iceoryx_hoofs_types.hpp"
 
+#define IOX_HOOFS_SUBSET @IOX_HOOFS_SUBSET@
+
 namespace iox
 {
 namespace build

iceoryx_hoofs/concurrent/buffer/include/iox/detail/spsc_sofi.inl

@@ -68,8 +68,8 @@ inline std::pair<uint64_t, uint64_t> SpscSofi<ValueType, CapacityValue>::getRead
 template <class ValueType, uint64_t CapacityValue>
 inline uint64_t SpscSofi<ValueType, CapacityValue>::size() const noexcept
 {
-    auto [readPosition, writePosition] = getReadWritePositions();
-    return writePosition - readPosition;
+    auto positions = getReadWritePositions();
+    return std::get<1>(positions) - std::get<0>(positions);
 }
 
 template <class ValueType, uint64_t CapacityValue>
@@ -92,8 +92,8 @@ inline bool SpscSofi<ValueType, CapacityValue>::setCapacity(const uint64_t newSi
 template <class ValueType, uint64_t CapacityValue>
 inline bool SpscSofi<ValueType, CapacityValue>::empty() const noexcept
 {
-    auto [readPosition, writePosition] = getReadWritePositions();
-    return readPosition == writePosition;
+    auto positions = getReadWritePositions();
+    return std::get<0>(positions) == std::get<1>(positions);
 }
 
 template <class ValueType, uint64_t CapacityValue>

iceoryx_hoofs/container/include/iox/detail/fixed_position_container.inl

@@ -19,6 +19,7 @@
 #define IOX_HOOFS_CONTAINER_DETAIL_FIXED_POSITION_CONTAINER_INL
 
 #include "iox/fixed_position_container.hpp"
+#include "iox/iceoryx_hoofs_deployment.hpp"
 
 namespace iox
 {
@@ -97,7 +98,11 @@ inline void FixedPositionContainer<T, CAPACITY>::copy_and_move_impl(RhsType&& rh
     constexpr bool is_move = Helper::is_move;
 
     // status array is not yet initialized for constructor creation
+#if IOX_HOOFS_SUBSET
+    if (is_ctor)
+#else
     if constexpr (is_ctor)
+#endif
     {
         for (IndexType i = 0; i < CAPACITY; ++i)
         {
@@ -153,7 +158,11 @@ inline void FixedPositionContainer<T, CAPACITY>::copy_and_move_impl(RhsType&& rh
     m_size = rhs.m_size;
 
     // reset rhs if is_move is true
+#if IOX_HOOFS_SUBSET
+    if (is_move)
+#else
     if constexpr (is_move)
+#endif
     {
         rhs.clear();
     }

iceoryx_hoofs/container/include/iox/detail/vector.inl

@@ -18,6 +18,7 @@
 #define IOX_HOOFS_CONTAINER_VECTOR_INL
 
 #include "iox/assertions.hpp"
+#include "iox/iceoryx_hoofs_deployment.hpp"
 #include "iox/vector.hpp"
 
 #include <cstring> // std::memcpy, std::memmove
@@ -88,12 +89,14 @@ inline vector<T, Capacity>& vector<T, Capacity>::operator=(const vector& rhs) no
         uint64_t i{0U};
         const uint64_t rhsSize{rhs.size()};
 
+#if not IOX_HOOFS_SUBSET
         if constexpr (std::is_trivially_copyable<T>::value)
         {
             std::memcpy(data(), rhs.data(), static_cast<size_t>(rhsSize) * sizeof(T));
             i = rhsSize;
         }
         else
+#endif
         {
             const uint64_t minSize{algorithm::minVal(m_size, rhsSize)};
 
@@ -127,12 +130,14 @@ inline vector<T, Capacity>& vector<T, Capacity>::operator=(vector&& rhs) noexcep
         uint64_t i{0U};
         const uint64_t rhsSize{rhs.size()};
 
+#if not IOX_HOOFS_SUBSET
         if constexpr (std::is_trivially_copyable<T>::value)
         {
             std::memcpy(data(), rhs.data(), static_cast<size_t>(rhsSize) * sizeof(T));
             i = rhsSize;
         }
         else
+#endif
         {
             const uint64_t minSize{algorithm::minVal(m_size, rhsSize)};
 
@@ -189,7 +194,11 @@ inline bool vector<T, Capacity>::emplace_back(Targs&&... args) noexcept
 {
     if (m_size < Capacity)
     {
+#if IOX_HOOFS_SUBSET
+        if (std::is_trivial<T>::value)
+#else
         if constexpr (std::is_trivial<T>::value)
+#endif
         {
             at_unchecked(m_size++) = T{std::forward<Targs>(args)...};
         }
@@ -217,6 +226,8 @@ inline bool vector<T, Capacity>::emplace(const uint64_t position, Targs&&... arg
     {
         return emplace_back(std::forward<Targs>(args)...);
     }
+
+#if not IOX_HOOFS_SUBSET
     if constexpr (std::is_trivial<T>::value)
     {
         resize(size() + 1U);
@@ -225,13 +236,18 @@ inline bool vector<T, Capacity>::emplace(const uint64_t position, Targs&&... arg
         at_unchecked(position) = T{std::forward<Targs>(args)...};
     }
     else
+#endif
     {
         IOX_DISCARD_RESULT(emplace_back(std::move(at_unchecked(sizeBeforeEmplace - 1U))));
         for (uint64_t i{sizeBeforeEmplace - 1U}; i > position; --i)
         {
             at_unchecked(i) = std::move(at_unchecked(i - 1U));
         }
+#if IOX_HOOFS_SUBSET
+        if (!std::is_trivially_destructible<T>::value)
+#else
         if constexpr (!std::is_trivially_destructible<T>::value)
+#endif
         {
             at_unchecked(position).~T();
         }
@@ -259,7 +275,11 @@ inline bool vector<T, Capacity>::pop_back() noexcept
 {
     if (m_size > 0U)
     {
+#if IOX_HOOFS_SUBSET
+        if (std::is_trivial<T>::value)
+#else
         if constexpr (std::is_trivial<T>::value)
+#endif
         {
             m_size--;
         }
@@ -407,6 +427,7 @@ inline bool vector<T, Capacity>::erase(iterator position) noexcept
         // AXIVION Next Line AutosarC++19_03-M5.0.9 : False positive. Pointer arithmetic occurs here.
         uint64_t index{static_cast<uint64_t>(position - begin())};
         uint64_t n{index};
+#if not IOX_HOOFS_SUBSET
         if constexpr (std::is_trivially_copyable<T>::value)
         {
             if constexpr (!(std::is_trivially_destructible<T>::value))
@@ -417,6 +438,7 @@ inline bool vector<T, Capacity>::erase(iterator position) noexcept
             std::memmove(data() + n, data() + n + 1U, static_cast<size_t>(dataLen) * sizeof(T));
         }
         else
+#endif
         {
             while ((n + 1U) < size())
             {
@@ -452,7 +474,11 @@ inline const T& vector<T, Capacity>::at_unchecked(const uint64_t index) const no
 template <typename T, uint64_t Capacity>
 inline void vector<T, Capacity>::clearFrom(const uint64_t startPosition) noexcept
 {
+#if IOX_HOOFS_SUBSET
+    if (std::is_trivially_destructible<T>::value)
+#else
     if constexpr (std::is_trivially_destructible<T>::value)
+#endif
     {
         m_size = startPosition;
     }

iceoryx_hoofs/container/include/iox/fixed_position_container.hpp

@@ -127,55 +127,55 @@ class FixedPositionContainer final
 
     /// @brief Checks if the container is empty
     /// @return 'true' if the container is empty, 'false' otherwise
-    [[nodiscard]] bool empty() const noexcept;
+    IOX_NO_DISCARD bool empty() const noexcept;
 
     /// @brief Checks if the container is full
     /// @return 'true' if the container is full, 'false' otherwise
-    [[nodiscard]] bool full() const noexcept;
+    IOX_NO_DISCARD bool full() const noexcept;
 
     /// @brief Get the number of used slots in the container
     /// @return the number of used slots
-    [[nodiscard]] uint64_t size() const noexcept;
+    IOX_NO_DISCARD uint64_t size() const noexcept;
 
     /// @brief Get the capacity of the container
     /// @return the number of available slots
-    [[nodiscard]] constexpr uint64_t capacity() const noexcept;
+    IOX_NO_DISCARD constexpr uint64_t capacity() const noexcept;
 
     /// @brief Get the iterator to the element pointed to by the index
     /// @param[in] index of the element the for the iterator
     /// @return iterator pointing to the element at index or end iterator if index was out of bounds or index pointed to
     /// an empty slot
-    [[nodiscard]] Iterator iter_from_index(const IndexType index);
+    IOX_NO_DISCARD Iterator iter_from_index(const IndexType index);
 
     /// @brief Get the const iterator to the element pointed to by the index
     /// @param[in] index of the element the for the iterator
     /// @return iterator pointing to the element at index or end iterator if index was out of bounds or index pointed to
     /// an empty slot
-    [[nodiscard]] ConstIterator iter_from_index(const IndexType index) const;
+    IOX_NO_DISCARD ConstIterator iter_from_index(const IndexType index) const;
 
     /// @brief Get an iterator pointing to the beginning of the container
     /// @return iterator pointing to the beginning of the container
-    [[nodiscard]] Iterator begin() noexcept;
+    IOX_NO_DISCARD Iterator begin() noexcept;
 
     /// @brief Get a const iterator pointing to the beginning of the container
     /// @return const iterator pointing to the beginning of the container
-    [[nodiscard]] ConstIterator begin() const noexcept;
+    IOX_NO_DISCARD ConstIterator begin() const noexcept;
 
     /// @brief Get a const iterator pointing to the beginning of the container
     /// @return const iterator pointing to the beginning of the container
-    [[nodiscard]] ConstIterator cbegin() const noexcept;
+    IOX_NO_DISCARD ConstIterator cbegin() const noexcept;
 
     /// @brief Get an iterator pointing to the end of the container
     /// @return iterator pointing to the end of the container
-    [[nodiscard]] Iterator end() noexcept;
+    IOX_NO_DISCARD Iterator end() noexcept;
 
     /// @brief Get a const iterator pointing to the end of the container
     /// @return const iterator pointing to the end of the container
-    [[nodiscard]] ConstIterator end() const noexcept;
+    IOX_NO_DISCARD ConstIterator end() const noexcept;
 
     /// @brief Get a const iterator pointing to the end of the container
     /// @return const iterator pointing to the end of the container
-    [[nodiscard]] ConstIterator cend() const noexcept;
+    IOX_NO_DISCARD ConstIterator cend() const noexcept;
 
   private:
     enum class SlotStatus : uint8_t
@@ -237,7 +237,7 @@ class FixedPositionContainer final
         /// @attention aborts if the iterator
         ///              - is an 'end' iterator
         ///              - the slot the iterator point to is not in use
-        [[nodiscard]] Value& operator*() const
+        IOX_NO_DISCARD Value& operator*() const
         {
             IOX_ENFORCE(m_index <= Index::LAST, "Access with invalid index!");
             IOX_ENFORCE(m_container.get().m_status[m_index] == SlotStatus::USED, "Invalid access! Slot not in use!");
@@ -249,7 +249,7 @@ class FixedPositionContainer final
         /// @attention aborts if the iterator
         ///              - is an 'end' iterator
         ///              - the slot the iterator point to is not in use
-        [[nodiscard]] Value* operator->() const
+        IOX_NO_DISCARD Value* operator->() const
         {
             IOX_ENFORCE(m_index <= Index::LAST, "Access with invalid index!");
             IOX_ENFORCE(m_container.get().m_status[m_index] == SlotStatus::USED, "Invalid access! Slot not in use!");
@@ -261,7 +261,7 @@ class FixedPositionContainer final
         /// @attention aborts if the iterator
         ///              - is an 'end' iterator
         ///              - the slot the iterator point to is not in use
-        [[nodiscard]] Value* to_ptr() const
+        IOX_NO_DISCARD Value* to_ptr() const
         {
             IOX_ENFORCE(m_index <= Index::LAST, "Access with invalid index!");
             IOX_ENFORCE(m_container.get().m_status[m_index] == SlotStatus::USED, "Invalid access! Slot not in use!");
@@ -271,31 +271,31 @@ class FixedPositionContainer final
         /// @brief Get the index of the element the iterator points to
         /// @return index of the element the iterator points to
         /// @attention this can point out of the container in case of the 'end' iterator
-        [[nodiscard]] IndexType to_index() const
+        IOX_NO_DISCARD IndexType to_index() const
         {
             return m_index;
         }
 
         /// @brief Check if the iterator origins from the provided container
         /// @param[in] container to determine the origin of the iterator
         /// @return 'true' if the iterator origins from the provide container, 'false' otherwise
-        [[nodiscard]] bool origins_from(const Container& container) const
+        IOX_NO_DISCARD bool origins_from(const Container& container) const
         {
             return &m_container.get() == &container;
         }
 
         /// @brief Compares iterators for equality
         /// @return 'true' if iterators are the same, 'false' otherwise
         template <IterMutability RHS_TYPE>
-        [[nodiscard]] bool operator==(const IteratorBase<RHS_TYPE>& rhs) const
+        IOX_NO_DISCARD bool operator==(const IteratorBase<RHS_TYPE>& rhs) const
         {
             return origins_from(rhs.m_container.get()) && (m_index == rhs.m_index);
         }
 
         /// @brief Compares iterators for non-equality
         /// @return 'true' if iterators are not the same, 'false' otherwise
         template <IterMutability RHS_TYPE>
-        [[nodiscard]] bool operator!=(const IteratorBase<RHS_TYPE>& rhs) const
+        IOX_NO_DISCARD bool operator!=(const IteratorBase<RHS_TYPE>& rhs) const
         {
             return !(*this == rhs);
         }

iceoryx_hoofs/container/include/iox/uninitialized_array.hpp

@@ -20,7 +20,6 @@
 
 #include "iox/iceoryx_hoofs_types.hpp"
 
-#include <cstddef>
 #include <cstdint>
 
 namespace iox
@@ -38,7 +37,7 @@ struct ZeroedBuffer
         // AXIVION Next Construct AutosarC++19_03-A1.1.1 : object size depends on template parameter and has to be taken care of at the specific template instantiation
         // AXIVION Next Construct AutosarC++19_03-A18.1.1 : required as low level building block, encapsulated in abstraction and not directly used
         // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays, hicpp-avoid-c-arrays)
-        std::byte data[sizeof(ElementType)];
+        byte data[sizeof(ElementType)];
     };
     // AXIVION Next Construct AutosarC++19_03-A1.1.1 : object size depends on template parameter and has to be taken care of at the specific template instantiation
     // AXIVION Next Construct AutosarC++19_03-A18.1.1 : required as low level building block, encapsulated in abstraction and not directly used
@@ -58,7 +57,7 @@ struct NonZeroedBuffer
         // AXIVION Next Construct AutosarC++19_03-A1.1.1 : object size depends on template parameter and has to be taken care of at the specific template instantiation
         // AXIVION Next Construct AutosarC++19_03-A18.1.1 : required as low level building block, encapsulated in abstraction and not directly used
         // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays, hicpp-avoid-c-arrays)
-        std::byte data[sizeof(ElementType)];
+        byte data[sizeof(ElementType)];
     };
     // AXIVION Next Construct AutosarC++19_03-A1.1.1 : object size depends on template parameter and has to be taken care of at the specific template instantiation
     // AXIVION Next Construct AutosarC++19_03-A18.1.1 : required as low level building block, encapsulated in abstraction and not directly used