Skip to content

Avoid redundant declaration of error_number_to_condition with GCC -Wredundant-decls #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pinwhell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid redundant declaration of error_number_to_condition with GCC -Wredundant-decls #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions include/asio/error.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,10 @@ inline asio::error_code make_error_code(misc_errors e)

// boostify: non-boost code starts here
namespace detail {

#if !defined(ASIO_ERROR_NUMBER_TO_CONDITION_DECLARED)
#define ASIO_ERROR_NUMBER_TO_CONDITION_DECLARED
ASIO_DECL std::error_condition error_number_to_condition(int ev);

#endif
} // namespace detail
// boostify: non-boost code ends here
} // namespace error
Expand Down
4 changes: 4 additions & 0 deletions include/asio/impl/error_code.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ namespace asio {
namespace error {
namespace detail {

// Forward declaration required when error.hpp has not been included.
#if !defined(ASIO_ERROR_NUMBER_TO_CONDITION_DECLARED)
#define ASIO_ERROR_NUMBER_TO_CONDITION_DECLARED
ASIO_DECL std::error_condition error_number_to_condition(int ev);
#endif

} // namespace detail
} // namespace error
Expand Down