diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/network_change_notifier_linux.h | 1 | ||||
| -rw-r--r-- | net/base/port_util.cc | 1 | ||||
| -rw-r--r-- | net/disk_cache/simple/simple_index_file.cc | 5 | ||||
| -rw-r--r-- | net/server/web_socket_encoder.cc | 1 | ||||
| -rw-r--r-- | net/spdy/spdy_alt_svc_wire_format.cc | 1 | ||||
| -rw-r--r-- | net/ssl/client_cert_store_nss.cc | 2 | ||||
| -rw-r--r-- | net/tools/quic/quic_server_session_base_test.cc | 1 | ||||
| -rw-r--r-- | net/tools/quic/quic_simple_server_session_test.cc | 1 |
8 files changed, 7 insertions, 6 deletions
diff --git a/net/base/network_change_notifier_linux.h b/net/base/network_change_notifier_linux.h index 85238cf9..48bda6b 100644 --- a/net/base/network_change_notifier_linux.h +++ b/net/base/network_change_notifier_linux.h @@ -6,6 +6,7 @@ #define NET_BASE_NETWORK_CHANGE_NOTIFIER_LINUX_H_ #include "base/compiler_specific.h" +#include "base/containers/hash_tables.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_export.h" diff --git a/net/base/port_util.cc b/net/base/port_util.cc index 1867dc3..7328b5e 100644 --- a/net/base/port_util.cc +++ b/net/base/port_util.cc @@ -4,6 +4,7 @@ #include "net/base/port_util.h" +#include <limits> #include <set> #include "base/lazy_instance.h" diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index 7e80c02..025ffe9 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc @@ -423,10 +423,7 @@ void SimpleIndexFile::Deserialize(const char* data, int data_len, return; } -#if !defined(OS_WIN) - // TODO(gavinp): Consider using std::unordered_map. - entries->resize(index_metadata.GetNumberOfEntries() + kExtraSizeForMerge); -#endif + entries->reserve(index_metadata.GetNumberOfEntries() + kExtraSizeForMerge); while (entries->size() < index_metadata.GetNumberOfEntries()) { uint64_t hash_key; EntryMetadata entry_metadata; diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc index 6d59713..d90a156 100644 --- a/net/server/web_socket_encoder.cc +++ b/net/server/web_socket_encoder.cc @@ -4,6 +4,7 @@ #include "net/server/web_socket_encoder.h" +#include <limits> #include <utility> #include <vector> diff --git a/net/spdy/spdy_alt_svc_wire_format.cc b/net/spdy/spdy_alt_svc_wire_format.cc index ba32160..a50590e 100644 --- a/net/spdy/spdy_alt_svc_wire_format.cc +++ b/net/spdy/spdy_alt_svc_wire_format.cc @@ -4,6 +4,7 @@ #include "net/spdy/spdy_alt_svc_wire_format.h" +#include <algorithm> #include <limits> #include <string> diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc index 8a6c329..ef29b55 100644 --- a/net/ssl/client_cert_store_nss.cc +++ b/net/ssl/client_cert_store_nss.cc @@ -6,6 +6,8 @@ #include <nss.h> #include <ssl.h> + +#include <algorithm> #include <utility> #include "base/bind.h" diff --git a/net/tools/quic/quic_server_session_base_test.cc b/net/tools/quic/quic_server_session_base_test.cc index 36432aa..efe96ec 100644 --- a/net/tools/quic/quic_server_session_base_test.cc +++ b/net/tools/quic/quic_server_session_base_test.cc @@ -26,7 +26,6 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -using __gnu_cxx::vector; using net::test::CryptoTestUtils; using net::test::MockConnection; using net::test::MockConnectionHelper; diff --git a/net/tools/quic/quic_simple_server_session_test.cc b/net/tools/quic/quic_simple_server_session_test.cc index e3ed3c9..fe9482f 100644 --- a/net/tools/quic/quic_simple_server_session_test.cc +++ b/net/tools/quic/quic_simple_server_session_test.cc @@ -30,7 +30,6 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -using __gnu_cxx::vector; using net::test::CryptoTestUtils; using net::test::MockConnection; using net::test::MockConnectionHelper; |