Eliminate cetl/pf17/attribute.hpp (issue #114) (#122)

OpenCyphal · May 13, 2024 · 63a1184 · 63a1184
1 parent 10fbb2b
commit 63a1184
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 30 deletions.
diff --git a/cetlvast/include/cetlvast/smf_policies.hpp b/cetlvast/include/cetlvast/smf_policies.hpp
@@ -10,7 +10,7 @@
 #ifndef CETLVAST_SMF_POLICIES_HPP_INCLUDED
 #define CETLVAST_SMF_POLICIES_HPP_INCLUDED
 
-#include <cetl/pf17/attribute.hpp>
+#include <cetl/cetl.hpp>
 #include <cstdint>
 
 namespace cetlvast

diff --git a/include/cetl/cetl.hpp b/include/cetl/cetl.hpp
@@ -195,6 +195,21 @@ static_assert((__cplusplus == CETL_CPP_STANDARD_14 || __cplusplus == CETL_CPP_ST
                __cplusplus >= CETL_CPP_STANDARD_20),
               "Unknown __cplusplus value found?");
 
+/// CETL_NODISCARD
+#ifndef CETL_NODISCARD
+#    if (__cplusplus >= CETL_CPP_STANDARD_17) || defined(CETL_DOXYGEN)
+/// A compatibility macros that expands to \c [[nodiscard]] if C++17 or later is used, otherwise it expands to
+/// a compiler-specific alternative if one is known, otherwise it expands to nothing.
+#        define CETL_NODISCARD [[nodiscard]]
+#    else
+#        if defined(__GNUC__) || defined(__clang__)
+#            define CETL_NODISCARD __attribute__((warn_unused_result))
+#        else
+#            define CETL_NODISCARD
+#        endif
+#    endif
+#endif
+
 /// @namespace cetl This namespace contains types specific to CETL and nested namespaces that contain types adhering
 ///                 to target C++ specifications.
 /// @namespace cetl::pmr CETL extensions to the standard Polymorphic Memory Resource (PMR) namespace, `std::pmr`.

diff --git a/include/cetl/pf17/attribute.hpp b/include/cetl/pf17/attribute.hpp
diff --git a/include/cetl/pf17/optional.hpp b/include/cetl/pf17/optional.hpp
@@ -8,9 +8,9 @@
 #ifndef CETL_PF17_OPTIONAL_HPP_INCLUDED
 #define CETL_PF17_OPTIONAL_HPP_INCLUDED
 
+#include <cetl/cetl.hpp>
 #include <cetl/_helper_enable_copy_move.hpp>
 #include <cetl/pf17/utility.hpp>
-#include <cetl/pf17/attribute.hpp>
 #include <cetl/pf17/type_traits.hpp>
 
 #include <algorithm>

diff --git a/include/cetl/pf17/variant.hpp b/include/cetl/pf17/variant.hpp
@@ -9,9 +9,9 @@
 #ifndef CETL_PF17_VARIANT_HPP_INCLUDED
 #define CETL_PF17_VARIANT_HPP_INCLUDED
 
+#include <cetl/cetl.hpp>
 #include <cetl/pf17/utility.hpp>
 #include <cetl/pf17/type_traits.hpp>
-#include <cetl/pf17/attribute.hpp>
 #include <cetl/type_traits_ext.hpp>
 
 #include <tuple>

diff --git a/include/cetl/rtti.hpp b/include/cetl/rtti.hpp
@@ -12,7 +12,9 @@
 #ifndef CETL_RTTI_HPP_INCLUDED
 #define CETL_RTTI_HPP_INCLUDED
 
-#include <cetl/pf17/attribute.hpp>
+#ifndef CETL_H_ERASE
+#    include "cetl/cetl.hpp"
+#endif
 
 #include <array>
 #include <cstdint>