commit | 411d3f7a3a18335713a46d9022ce25e018a19e47 | [log] [tgz] |
---|---|---|
author | davidben <[email protected]> | Fri Jan 22 01:41:41 2016 |
committer | Commit bot <[email protected]> | Fri Jan 22 01:43:27 2016 |
tree | 72cd74ea04f27cc8b01f7153f43e24ae8d48b512 | |
parent | 58be7eea6963f63c4395e97a8a8099916f738a61 [diff] [blame] |
Allow std::unordered_*. This is a reland of https://codereview.chromium.org/1502373009 with some fixes for components/metrics/leak_detector allocator type mismatches. Original issue's description: > Allow std::unordered_*. > > base::hash_* is, as a transition step, implemented in terms of > std::unordered_*. Later commits will convert existing uses. > > Also fix a host of IWYU problems that arose from this CL. > > (NOPRESUBMIT because the wstring presubmit check is overzealous > and complains about the reference to wstring in the comment.) > > Committed: https://crrev.com/3f37f7f1459e7b5a452c0e433493e0a6e9649ca7 > Cr-Commit-Position: refs/heads/master@{#370553} BUG=576864 [email protected],[email protected],[email protected],[email protected],[email protected] NOPRESUBMIT=true CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1615713003 Cr-Commit-Position: refs/heads/master@{#370867}
diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc index 6d59713d..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>