Skip to content

Commit

Permalink
iox-eclipse-iceoryx#2066 Remove iceoryx_platform/attributes.hpp
Browse files Browse the repository at this point in the history
  • Loading branch information
elBoberido committed Nov 17, 2023
1 parent 957d196 commit dc3930a
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 223 deletions.
7 changes: 7 additions & 0 deletions iceoryx_hoofs/legacy/include/iceoryx_hoofs/cxx/attributes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ namespace internal
/// @deprecated use 'iox::internal::IOX_DISCARD_RESULT_IMPL' instead of 'iox::cxx::internal::IOX_DISCARD_RESULT_IMPL'
using iox::internal::IOX_DISCARD_RESULT_IMPL;
} // namespace internal

// #define IOX_NO_DISCARD [[nodiscard]]

// #define IOX_FALLTHROUGH [[fallthrough]]

// #define IOX_MAYBE_UNUSED [[maybe_unused]]

} // namespace cxx
} // namespace iox

Expand Down
2 changes: 1 addition & 1 deletion iceoryx_hoofs/posix/filesystem/source/file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#include "iox/file.hpp"
#include "iceoryx_hoofs/posix_wrapper/posix_call.hpp"
#include "iceoryx_platform/attributes.hpp"
#include "iceoryx_platform/errno.hpp"
#include "iceoryx_platform/fcntl.hpp"
#include "iceoryx_platform/stdio.hpp"
#include "iox/attributes.hpp"
#include "iox/filesystem.hpp"

namespace iox
Expand Down
8 changes: 6 additions & 2 deletions iceoryx_hoofs/primitives/include/iox/attributes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#ifndef IOX_HOOFS_PRIMITIVES_ATTRIBUTES_HPP
#define IOX_HOOFS_PRIMITIVES_ATTRIBUTES_HPP

#include "iceoryx_platform/attributes.hpp"

namespace iox
{
namespace internal
Expand Down Expand Up @@ -47,6 +45,12 @@ inline void IOX_DISCARD_RESULT_IMPL(T&&) noexcept
/// @endcode
#define IOX_DISCARD_RESULT(expr) ::iox::internal::IOX_DISCARD_RESULT_IMPL(expr)

#define IOX_NO_DISCARD [[nodiscard]]

#define IOX_FALLTHROUGH [[fallthrough]]

#define IOX_MAYBE_UNUSED [[maybe_unused]]

// NOLINTEND(cppcoreguidelines-macro-usage)

#endif
52 changes: 0 additions & 52 deletions iceoryx_platform/freertos/include/iceoryx_platform/attributes.hpp

This file was deleted.

51 changes: 0 additions & 51 deletions iceoryx_platform/linux/include/iceoryx_platform/attributes.hpp

This file was deleted.

26 changes: 0 additions & 26 deletions iceoryx_platform/mac/include/iceoryx_platform/attributes.hpp

This file was deleted.

39 changes: 0 additions & 39 deletions iceoryx_platform/qnx/include/iceoryx_platform/attributes.hpp

This file was deleted.

26 changes: 0 additions & 26 deletions iceoryx_platform/unix/include/iceoryx_platform/attributes.hpp

This file was deleted.

26 changes: 0 additions & 26 deletions iceoryx_platform/win/include/iceoryx_platform/attributes.hpp

This file was deleted.

0 comments on commit dc3930a

Please sign in to comment.