diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-03 14:46:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 14:46:44 +0200 |
| commit | 7e4cb80d4c1aca0aa4707977d77ed1058f4803ca (patch) | |
| tree | 86d4291e32457f5f3bc3d844502fa78b524867be /drivers | |
| parent | 913620a9b804b10a880f6274df1d8ef44c27cb54 (diff) | |
| parent | cdf54d6c5fcaf20088cc334a9973cdd435041bc3 (diff) | |
Merge pull request #27594 from marxin/fix-duplicate-conditions
Fix duplicated conditions.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/net_socket_posix.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/unix/net_socket_posix.cpp b/drivers/unix/net_socket_posix.cpp index 2dffa083fe..37abccbe27 100644 --- a/drivers/unix/net_socket_posix.cpp +++ b/drivers/unix/net_socket_posix.cpp @@ -177,6 +177,13 @@ NetSocketPosix::~NetSocketPosix() { close(); } +// Silent a warning reported in #27594 + +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wlogical-op" +#endif + NetSocketPosix::NetError NetSocketPosix::_get_socket_error() { #if defined(WINDOWS_ENABLED) int err = WSAGetLastError(); @@ -201,6 +208,10 @@ NetSocketPosix::NetError NetSocketPosix::_get_socket_error() { #endif } +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic pop +#endif + bool NetSocketPosix::_can_use_ip(const IP_Address p_ip, const bool p_for_bind) const { if (p_for_bind && !(p_ip.is_valid() || p_ip.is_wildcard())) { |