diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 43172a9ac3..c3fd525e6a 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -836,14 +836,6 @@ rtc_static_library("rtc_base_generic") { ":rtc_base_objc", ] - # TODO(henrike): issue 3307, make rtc_base build with the Chromium default - # compiler settings. - suppressed_configs += [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - if (!is_win) { - cflags += [ "-Wno-uninitialized" ] - } - if (build_with_chromium) { if (is_win) { sources += [ "../../webrtc_overrides/rtc_base/win32socketinit.cc" ] @@ -981,16 +973,6 @@ config("rtc_base_tests_utils_exported_config") { defines = [ "GTEST_RELATIVE_PATH" ] } -config("rtc_base_tests_utils_warnings_config") { - if (is_win && is_clang) { - cflags = [ - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270 - "-Wno-reorder", - "-Wno-sign-compare", - ] - } -} - rtc_source_set("rtc_base_tests_utils") { testonly = true sources = [ @@ -1034,7 +1016,6 @@ rtc_source_set("rtc_base_tests_utils") { "virtualsocketserver.cc", "virtualsocketserver.h", ] - configs += [ ":rtc_base_tests_utils_warnings_config" ] public_configs = [ ":rtc_base_tests_utils_exported_config" ] deps = [ ":checks", @@ -1256,11 +1237,6 @@ if (rtc_include_tests) { ] } - config("rtc_base_unittests_config") { - if (is_clang) { - cflags = [ "-Wno-unused-const-variable" ] - } - } rtc_source_set("rtc_base_unittests") { testonly = true defines = [] @@ -1321,7 +1297,6 @@ if (rtc_include_tests) { public_deps = [ ":rtc_base", ] - configs += [ ":rtc_base_unittests_config" ] if (build_with_chromium) { include_dirs = [ "../../boringssl/src/include" ] } diff --git a/rtc_base/messagequeue.cc b/rtc_base/messagequeue.cc index 001d3ed148..10bde2091c 100644 --- a/rtc_base/messagequeue.cc +++ b/rtc_base/messagequeue.cc @@ -118,7 +118,6 @@ void MessageQueueManager::ClearInternal(MessageHandler *handler) { // allowed as the list of message queues does not change while queues are // cleared. MarkProcessingCritScope cs(&crit_, &processing_); - std::vector::iterator iter; for (MessageQueue* queue : message_queues_) { queue->Clear(handler); } diff --git a/rtc_base/openssladapter.cc b/rtc_base/openssladapter.cc index 87ac744c3a..48b89781ac 100644 --- a/rtc_base/openssladapter.cc +++ b/rtc_base/openssladapter.cc @@ -377,7 +377,7 @@ int OpenSSLAdapter::BeginSSL() { if (!tls_alpn_string.empty()) { SSL_set_alpn_protos( ssl_, reinterpret_cast(tls_alpn_string.data()), - tls_alpn_string.size()); + rtc::dchecked_cast(tls_alpn_string.size())); } } @@ -593,7 +593,7 @@ int OpenSSLAdapter::Send(const void* pv, size_t cb) { pending_data_.SetData(static_cast(pv), cb); // Since we're taking responsibility for sending this data, return its full // size. The user of this class can consider it sent. - return cb; + return rtc::dchecked_cast(cb); } return ret; diff --git a/rtc_base/opensslidentity.cc b/rtc_base/opensslidentity.cc index a86a757d01..bb651746fa 100644 --- a/rtc_base/opensslidentity.cc +++ b/rtc_base/opensslidentity.cc @@ -29,6 +29,7 @@ #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" #include "rtc_base/openssldigest.h" #include "rtc_base/opensslutility.h" @@ -267,7 +268,8 @@ SSLIdentity* OpenSSLIdentity::FromPEMChainStrings( const std::string& private_key, const std::string& certificate_chain) { BIO* bio = - BIO_new_mem_buf(certificate_chain.data(), certificate_chain.size()); + BIO_new_mem_buf(certificate_chain.data(), + rtc::dchecked_cast(certificate_chain.size())); if (!bio) return nullptr; BIO_set_mem_eof_return(bio, 0); diff --git a/rtc_base/physicalsocketserver.cc b/rtc_base/physicalsocketserver.cc index 594737e3e4..636c034e71 100644 --- a/rtc_base/physicalsocketserver.cc +++ b/rtc_base/physicalsocketserver.cc @@ -112,36 +112,6 @@ std::unique_ptr SocketServer::CreateDefault() { #endif } -#if defined(WEBRTC_WIN) -// Standard MTUs, from RFC 1191 -const uint16_t PACKET_MAXIMUMS[] = { - 65535, // Theoretical maximum, Hyperchannel - 32000, // Nothing - 17914, // 16Mb IBM Token Ring - 8166, // IEEE 802.4 - // 4464, // IEEE 802.5 (4Mb max) - 4352, // FDDI - // 2048, // Wideband Network - 2002, // IEEE 802.5 (4Mb recommended) - // 1536, // Expermental Ethernet Networks - // 1500, // Ethernet, Point-to-Point (default) - 1492, // IEEE 802.3 - 1006, // SLIP, ARPANET - // 576, // X.25 Networks - // 544, // DEC IP Portal - // 512, // NETBIOS - 508, // IEEE 802/Source-Rt Bridge, ARCNET - 296, // Point-to-Point (low delay) - 68, // Official minimum - 0, // End of list marker -}; - -static const int IP_HEADER_SIZE = 20u; -static const int IPV6_HEADER_SIZE = 40u; -static const int ICMP_HEADER_SIZE = 8u; -static const int ICMP_PING_TIMEOUT_MILLIS = 10000u; -#endif - PhysicalSocket::PhysicalSocket(PhysicalSocketServer* ss, SOCKET s) : ss_(ss), s_(s), error_(0), state_((s == INVALID_SOCKET) ? CS_CLOSED : CS_CONNECTED), diff --git a/rtc_base/win32socketserver.cc b/rtc_base/win32socketserver.cc index c098945b1c..7be7ffe2c9 100644 --- a/rtc_base/win32socketserver.cc +++ b/rtc_base/win32socketserver.cc @@ -24,35 +24,6 @@ namespace rtc { // Win32Socket /////////////////////////////////////////////////////////////////////////////// -// TODO: Move this to a common place where PhysicalSocketServer can -// share it. -// Standard MTUs -static const uint16_t PACKET_MAXIMUMS[] = { - 65535, // Theoretical maximum, Hyperchannel - 32000, // Nothing - 17914, // 16Mb IBM Token Ring - 8166, // IEEE 802.4 - // 4464 // IEEE 802.5 (4Mb max) - 4352, // FDDI - // 2048, // Wideband Network - 2002, // IEEE 802.5 (4Mb recommended) - // 1536, // Expermental Ethernet Networks - // 1500, // Ethernet, Point-to-Point (default) - 1492, // IEEE 802.3 - 1006, // SLIP, ARPANET - // 576, // X.25 Networks - // 544, // DEC IP Portal - // 512, // NETBIOS - 508, // IEEE 802/Source-Rt Bridge, ARCNET - 296, // Point-to-Point (low delay) - 68, // Official minimum - 0, // End of list marker -}; - -static const int IP_HEADER_SIZE = 20u; -static const int ICMP_HEADER_SIZE = 8u; -static const int ICMP_PING_TIMEOUT_MILLIS = 10000u; - // TODO: Enable for production builds also? Use FormatMessage? #if !defined(NDEBUG) LPCSTR WSAErrorToString(int error, LPCSTR *description_result) {