IWYU rtc_base (socket-related)
using the usual
find rtc_base -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner
followed by
tools_webrtc/gn_check_autofix.py -C out/Default
followed by
git cl format
and manual resolution or reverts of files that require a more
focused review.
Split from
https://webrtc-review.googlesource.com/c/src/+/398903
Bug: webrtc:42226242
Change-Id: Ieced1756938d3cb75a6ffe187d2fa562a5abf046
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398990
Commit-Queue: Philipp Hancke <phancke@meta.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45121}
diff --git a/rtc_base/null_socket_server.cc b/rtc_base/null_socket_server.cc
index 47896a4..088e4ad 100644
--- a/rtc_base/null_socket_server.cc
+++ b/rtc_base/null_socket_server.cc
@@ -13,7 +13,7 @@
#include "api/units/time_delta.h"
#include "rtc_base/checks.h"
#include "rtc_base/event.h"
-#include "rtc_base/socket_server.h"
+#include "rtc_base/socket.h"
namespace webrtc {
diff --git a/rtc_base/null_socket_server.h b/rtc_base/null_socket_server.h
index 5806cf7..ccad464 100644
--- a/rtc_base/null_socket_server.h
+++ b/rtc_base/null_socket_server.h
@@ -11,6 +11,7 @@
#ifndef RTC_BASE_NULL_SOCKET_SERVER_H_
#define RTC_BASE_NULL_SOCKET_SERVER_H_
+#include "api/units/time_delta.h"
#include "rtc_base/event.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_server.h"
diff --git a/rtc_base/socket.cc b/rtc_base/socket.cc
index 26a5081..639e78b 100644
--- a/rtc_base/socket.cc
+++ b/rtc_base/socket.cc
@@ -12,6 +12,7 @@
#include <cstdint>
+#include "api/units/timestamp.h"
#include "rtc_base/buffer.h"
namespace webrtc {
diff --git a/rtc_base/socket.h b/rtc_base/socket.h
index 160bd59..ad4e132 100644
--- a/rtc_base/socket.h
+++ b/rtc_base/socket.h
@@ -11,20 +11,11 @@
#ifndef RTC_BASE_SOCKET_H_
#define RTC_BASE_SOCKET_H_
-#include <errno.h>
-
+#include <cerrno>
#include <cstddef>
#include <cstdint>
#include <optional>
-// IWYU pragma: begin_exports
-#if defined(WEBRTC_POSIX)
-#include <arpa/inet.h>
-#include <sys/types.h>
-#define SOCKET_EACCES EACCES
-#endif
-// IWYU pragma: end_exports
-
#include "api/transport/ecn_marking.h"
#include "api/units/timestamp.h"
#include "rtc_base/buffer.h"
@@ -33,10 +24,17 @@
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
+// IWYU pragma: begin_exports
+#if defined(WEBRTC_POSIX)
+#include <arpa/inet.h>
+#include <sys/types.h>
+#define SOCKET_EACCES EACCES
+#endif
+// IWYU pragma: end_exports
+
// Rather than converting errors into a private namespace,
// Reuse the POSIX socket api errors. Note this depends on
// Win32 compatibility.
-
#if defined(WEBRTC_WIN)
#undef EWOULDBLOCK // Remove errno.h's definition for each macro below.
#define EWOULDBLOCK WSAEWOULDBLOCK
diff --git a/rtc_base/socket_adapters.cc b/rtc_base/socket_adapters.cc
index 3cd523b..a3ff8bd 100644
--- a/rtc_base/socket_adapters.cc
+++ b/rtc_base/socket_adapters.cc
@@ -8,22 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#if defined(_MSC_VER) && _MSC_VER < 1300
-#pragma warning(disable : 4786)
-#endif
-
#include "rtc_base/socket_adapters.h"
#include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
-#include "absl/strings/match.h"
-#include "absl/strings/string_view.h"
-#include "rtc_base/buffer.h"
-#include "rtc_base/byte_buffer.h"
+#include "api/array_view.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/zero_memory.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
namespace webrtc {
diff --git a/rtc_base/socket_address_pair.cc b/rtc_base/socket_address_pair.cc
index b97c086..c956b3c 100644
--- a/rtc_base/socket_address_pair.cc
+++ b/rtc_base/socket_address_pair.cc
@@ -10,6 +10,10 @@
#include "rtc_base/socket_address_pair.h"
+#include <cstddef>
+
+#include "rtc_base/socket_address.h"
+
namespace webrtc {
SocketAddressPair::SocketAddressPair(const SocketAddress& src,
diff --git a/rtc_base/test_echo_server.cc b/rtc_base/test_echo_server.cc
index 484ed84..5b270d1 100644
--- a/rtc_base/test_echo_server.cc
+++ b/rtc_base/test_echo_server.cc
@@ -10,6 +10,7 @@
#include "rtc_base/test_echo_server.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/socket_server.h"
namespace webrtc {
