Auto PR from release/0.7 to main (#430)

* fix_epoll_oneshot * add judgement for conflicted ONE_SHOT flag in add_interests() (#422) improve logic in add_interests() and rm_interests() * fix gcc13 (#429) --------- Co-authored-by: lihuiba <[email protected]> Co-authored-by: Huiba Li <[email protected]>
alibaba · Mar 28, 2024 · 899de79 · 899de79
1 parent 89bafd4
commit 899de79
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/common/iovector.h b/common/iovector.h
@@ -39,6 +39,10 @@ limitations under the License.
 #include <photon/common/callback.h>
 #include <photon/common/io-alloc.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-warning-option"
+#pragma GCC diagnostic ignored "-Wzero-length-bounds"
+
 inline bool operator == (const iovec& a, const iovec& b)
 {
     return a.iov_base == b.iov_base && a.iov_len == b.iov_len;
@@ -1075,3 +1079,4 @@ class SmartCloneIOV
 
 #undef IF_ASSERT_RETURN
 
+#pragma GCC diagnostic pop
diff --git a/net/datagram_socket.h b/net/datagram_socket.h
@@ -50,6 +50,8 @@ class IDatagramSocket : public IMessage,
     ssize_t recv(B* buf, S count, int flags = 0) {
         return cast()->recv(buf, count, nullptr, nullptr, flags);
     }
+    using IMessage::recv;
+    using IMessage::send;
 };
 
 class UDPSocket : public IDatagramSocket {

diff --git a/rpc/rpc.cpp b/rpc/rpc.cpp
@@ -324,8 +324,12 @@ namespace rpc {
             if (unlikely(!m_running))
                 return -1;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-warning-option"
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
             ThreadLink node;
             m_list.push_back(&node);
+#pragma GCC diagnostic pop
             DEFER(m_list.erase(&node));
             // stream serve refcount
             int stream_serv_count = 0;