[#2499] Restore platform specific attributes

Author: FerdinandSpitzschnueffler

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/legacy/include/iceoryx_hoofs/cxx/attributes.hpp

@@ -38,13 +38,4 @@ using iox::internal::IOX_DISCARD_RESULT_IMPL;
 
 // clang-format on
 
-/// @deprecated use '[[nodiscard]]' instead of 'IOX_NO_DISCARD'
-#define IOX_NO_DISCARD [[nodiscard, IOX_NO_DISCARD_is_deprecated_use__nodiscard__attribute]]
-
-/// @deprecated use '[[fallthrough]]' instead of 'IOX_FALLTHROUGH'
-#define IOX_FALLTHROUGH [[fallthrough, IOX_FALLTHROUGH_is_deprecated_use__fallthrough__attribute]]
-
-/// @deprecated use '[[maybe_unused]]' instead of 'IOX_MAYBE_UNUSED'
-#define IOX_MAYBE_UNUSED [[maybe_unused, IOX_MAYBE_UNUSED_is_deprecated_use__maybe_unused__attribute]]
-
 #endif

iceoryx_hoofs/posix/design/include/iox/detail/posix_call.inl

@@ -58,13 +58,13 @@ inline PosixCallDetails<ReturnType>::PosixCallDetails(const char* posixFunctionN
 /// of "strerror_r", the posix compliant one which returns an int and stores the message in the buffer
 /// and a gnu version which returns a pointer to the message and sometimes stores the message
 /// in the buffer
-inline string<POSIX_CALL_ERROR_STRING_SIZE> errorLiteralToString(const int returnCode [[maybe_unused]],
+inline string<POSIX_CALL_ERROR_STRING_SIZE> errorLiteralToString(const int returnCode IOX_MAYBE_UNUSED,
                                                                  char* const buffer)
 {
     return string<POSIX_CALL_ERROR_STRING_SIZE>(TruncateToCapacity, buffer);
 }
 
-inline string<POSIX_CALL_ERROR_STRING_SIZE> errorLiteralToString(const char* msg, char* const buffer [[maybe_unused]])
+inline string<POSIX_CALL_ERROR_STRING_SIZE> errorLiteralToString(const char* msg, char* const buffer IOX_MAYBE_UNUSED)
 {
     return string<POSIX_CALL_ERROR_STRING_SIZE>(TruncateToCapacity, msg);
 }

iceoryx_hoofs/posix/design/include/iox/posix_call.hpp

@@ -79,7 +79,7 @@ struct PosixCallDetails
 
 /// @brief class which is created by the verificator to evaluate the result of a posix call
 template <typename ReturnType>
-class [[nodiscard]] PosixCallEvaluator
+class IOX_NO_DISCARD PosixCallEvaluator
 {
   public:
     /// @brief ignore specified errnos from the evaluation
@@ -115,7 +115,7 @@ class [[nodiscard]] PosixCallEvaluator
 
 /// @brief class which verifies the return value of a posix function call
 template <typename ReturnType>
-class [[nodiscard]] PosixCallVerificator
+class IOX_NO_DISCARD PosixCallVerificator
 {
   public:
     /// @brief the posix function call defines success through a single value
@@ -147,7 +147,7 @@ class [[nodiscard]] PosixCallVerificator
 };
 
 template <typename ReturnType, typename... FunctionArguments>
-class [[nodiscard]] PosixCallBuilder
+class IOX_NO_DISCARD PosixCallBuilder
 {
   public:
     /// @brief input function type

iceoryx_hoofs/primitives/include/iox/attributes.hpp

@@ -17,6 +17,8 @@
 #ifndef IOX_HOOFS_PRIMITIVES_ATTRIBUTES_HPP
 #define IOX_HOOFS_PRIMITIVES_ATTRIBUTES_HPP
 
+#include "iceoryx_platform/attributes.hpp"
+
 namespace iox
 {
 namespace internal

iceoryx_hoofs/test/moduletests/test_container_fixed_position_container.cpp

@@ -2988,9 +2988,9 @@ TEST_F(FixedPositionContainer_test, DereferencingEndIteratorCallsErrorHandler)
 {
     ::testing::Test::RecordProperty("TEST_ID", "f2ccf248-97f8-4265-9bb4-9c8e7cb79e67");
 
-    IOX_EXPECT_FATAL_FAILURE([&] { auto _ [[maybe_unused]] = *sut.end(); }, iox::er::ENFORCE_VIOLATION);
+    IOX_EXPECT_FATAL_FAILURE([&] { auto _ IOX_MAYBE_UNUSED = *sut.end(); }, iox::er::ENFORCE_VIOLATION);
 
-    IOX_EXPECT_FATAL_FAILURE([&] { auto _ [[maybe_unused]] = *sut.cend(); }, iox::er::ENFORCE_VIOLATION);
+    IOX_EXPECT_FATAL_FAILURE([&] { auto _ IOX_MAYBE_UNUSED = *sut.cend(); }, iox::er::ENFORCE_VIOLATION);
 }
 
 TEST_F(FixedPositionContainer_test, DereferencingInvalidIteratorCallsErrorHandler)
@@ -3000,7 +3000,7 @@ TEST_F(FixedPositionContainer_test, DereferencingInvalidIteratorCallsErrorHandle
     auto it = sut.emplace(135U);
     sut.erase(it);
 
-    IOX_EXPECT_FATAL_FAILURE([&] { auto _ [[maybe_unused]] = *it; }, iox::er::ENFORCE_VIOLATION);
+    IOX_EXPECT_FATAL_FAILURE([&] { auto _ IOX_MAYBE_UNUSED = *it; }, iox::er::ENFORCE_VIOLATION);
 }
 
 TEST_F(FixedPositionContainer_test, ArrowOperatorOnNonConstItertorLeadsToNonConstPointer)
@@ -3117,9 +3117,9 @@ TEST_F(FixedPositionContainer_test, ToPtrOnEndIteratorCallsErrorHandler)
 {
     ::testing::Test::RecordProperty("TEST_ID", "51b76d04-6c8c-486e-88c9-8b6b760c41d4");
 
-    IOX_EXPECT_FATAL_FAILURE([&] { auto* _ [[maybe_unused]] = sut.end().to_ptr(); }, iox::er::ENFORCE_VIOLATION);
+    IOX_EXPECT_FATAL_FAILURE([&] { auto* _ IOX_MAYBE_UNUSED = sut.end().to_ptr(); }, iox::er::ENFORCE_VIOLATION);
 
-    IOX_EXPECT_FATAL_FAILURE([&] { const auto* _ [[maybe_unused]] = sut.cend().to_ptr(); }, iox::er::ENFORCE_VIOLATION);
+    IOX_EXPECT_FATAL_FAILURE([&] { const auto* _ IOX_MAYBE_UNUSED = sut.cend().to_ptr(); }, iox::er::ENFORCE_VIOLATION);
 }
 
 TEST_F(FixedPositionContainer_test, ToPtrOnInvalidIteratorCallsErrorHandler)
@@ -3129,7 +3129,7 @@ TEST_F(FixedPositionContainer_test, ToPtrOnInvalidIteratorCallsErrorHandler)
     auto it = sut.emplace(135U);
     sut.erase(it);
 
-    IOX_EXPECT_FATAL_FAILURE([&] { auto* _ [[maybe_unused]] = it.to_ptr(); }, iox::er::ENFORCE_VIOLATION);
+    IOX_EXPECT_FATAL_FAILURE([&] { auto* _ IOX_MAYBE_UNUSED = it.to_ptr(); }, iox::er::ENFORCE_VIOLATION);
 }
 
 TEST_F(FixedPositionContainer_test, ToIndexOnIteratorReturnsCorrespondingIndex)
@@ -3267,8 +3267,8 @@ TEST_F(FixedPositionContainer_test, IteratorDestructorDoesNotDestroyObjectItPoin
     fillSutComplex();
 
     {
-        auto it [[maybe_unused]] = sut_complex.begin();
-        auto cit [[maybe_unused]] = sut_complex.cbegin();
+        auto it IOX_MAYBE_UNUSED = sut_complex.begin();
+        auto cit IOX_MAYBE_UNUSED = sut_complex.cbegin();
     }
 
     EXPECT_THAT(stats.dTor, Eq(0));

iceoryx_hoofs/test/moduletests/test_container_forward_list.cpp

@@ -876,7 +876,7 @@ TEST_F(forward_list_test, InsertAfterSomeElementsListLValue)
     }
     sut.insert_after(iter, a);
 
-    for (auto& x [[maybe_unused]] : sut)
+    for (auto& x IOX_MAYBE_UNUSED : sut)
     {
         ++loopCounter;
     }
@@ -1146,7 +1146,7 @@ TEST_F(forward_list_test, IteratorTraitsGetValueType)
 TEST_F(forward_list_test, IteratorTraitsCheckIteratorCategoryOnConstIterator)
 {
     ::testing::Test::RecordProperty("TEST_ID", "ffbb06eb-5267-45e0-91e4-6172a27a3489");
-    auto iter [[maybe_unused]] = sut.cbefore_begin();
+    auto iter IOX_MAYBE_UNUSED = sut.cbefore_begin();
     ASSERT_NE(typeid(std::iterator_traits<decltype(iter)>::iterator_category), typeid(std::random_access_iterator_tag));
     EXPECT_EQ(typeid(std::iterator_traits<decltype(iter)>::iterator_category), typeid(std::forward_iterator_tag));
 }

iceoryx_hoofs/test/moduletests/test_container_list.cpp

@@ -1160,7 +1160,7 @@ TEST_F(list_test, InsertSomeElementsListLValue)
     }
     sut.insert(iter, a);
 
-    for (auto& x [[maybe_unused]] : sut)
+    for (auto& x IOX_MAYBE_UNUSED : sut)
     {
         ++loopCounter;
     }
@@ -1478,7 +1478,7 @@ TEST_F(list_test, IteratorTraitsGetValueType)
 TEST_F(list_test, IteratorTraitsCheckIteratorCategoryOnConstIterator)
 {
     ::testing::Test::RecordProperty("TEST_ID", "295e6406-93bc-4a12-9b03-33e5d494b2c2");
-    auto iter [[maybe_unused]] = sut.cbegin();
+    auto iter IOX_MAYBE_UNUSED = sut.cbegin();
     ASSERT_NE(typeid(std::iterator_traits<decltype(iter)>::iterator_category), typeid(std::random_access_iterator_tag));
     EXPECT_EQ(typeid(std::iterator_traits<decltype(iter)>::iterator_category), typeid(std::bidirectional_iterator_tag));
 }
@@ -2259,7 +2259,7 @@ TEST_F(list_test, invalidIteratorComparison)
 
     auto iter = sut.cbegin();
     ++iter;
-    auto iter2 [[maybe_unused]] = sut.erase(iter);
+    auto iter2 IOX_MAYBE_UNUSED = sut.erase(iter);
 
 
     IOX_EXPECT_FATAL_FAILURE([&] { IOX_DISCARD_RESULT(sut.cbegin() == iter); }, iox::er::ENFORCE_VIOLATION);
@@ -2293,7 +2293,7 @@ TEST_F(list_test, invalidIteratorDereferencing)
 
     auto iter = sut.cbegin();
     ++iter;
-    auto iter2 [[maybe_unused]] = sut.erase(iter);
+    auto iter2 IOX_MAYBE_UNUSED = sut.erase(iter);
 
     IOX_EXPECT_FATAL_FAILURE([&] { IOX_DISCARD_RESULT((*iter).value); }, iox::er::ENFORCE_VIOLATION);
 }
@@ -2309,7 +2309,7 @@ TEST_F(list_test, invalidIteratorAddressOfOperator)
 
     auto iter = sut.cbegin();
     ++iter;
-    auto iter2 [[maybe_unused]] = sut.erase(iter);
+    auto iter2 IOX_MAYBE_UNUSED = sut.erase(iter);
 
     IOX_EXPECT_FATAL_FAILURE([&] { IOX_DISCARD_RESULT(iter->value == 12U); }, iox::er::ENFORCE_VIOLATION);
 }

iceoryx_hoofs/test/moduletests/test_design_functional_interface_expect.cpp

@@ -121,7 +121,7 @@ template <>
 struct ExpectReturnsValueWhenValid<TYPE_HAS_NO_VALUE_METHOD>
 {
     template <typename TestFactory, typename ExpectCall>
-    static void performTest(const ExpectCall& callExpect [[maybe_unused]])
+    static void performTest(const ExpectCall& callExpect IOX_MAYBE_UNUSED)
     {
     }
 };

iceoryx_hoofs/test/moduletests/test_design_functional_interface_value_or.cpp

@@ -42,7 +42,7 @@ template <>
 struct ValueOrReturnsValueWhenValid<TYPE_HAS_NO_VALUE_METHOD>
 {
     template <typename TestFactory, typename ValueOrCall>
-    static void performTest(const ValueOrCall& callValueOr [[maybe_unused]])
+    static void performTest(const ValueOrCall& callValueOr IOX_MAYBE_UNUSED)
     {
     }
 };
@@ -77,7 +77,7 @@ template <>
 struct ValueOrReturnsArgumentWhenInalid<TYPE_HAS_NO_VALUE_METHOD>
 {
     template <typename TestFactory, typename ValueOrCall>
-    static void performTest(const ValueOrCall& callValueOr [[maybe_unused]])
+    static void performTest(const ValueOrCall& callValueOr IOX_MAYBE_UNUSED)
     {
     }
 };