diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 00:54:41 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 00:54:41 +0000 |
| commit | 7ef58d5b9c29dd112bbf98febe1854588ff7e04d (patch) | |
| tree | da80d68100e2333ecde6e9f004d0cd4110d4ccde | |
| parent | 6408ddb8ce1558a21aa7a9a0c30745ee9dfd79bc (diff) | |
| download | chromium_src-7ef58d5b9c29dd112bbf98febe1854588ff7e04d.zip chromium_src-7ef58d5b9c29dd112bbf98febe1854588ff7e04d.tar.gz chromium_src-7ef58d5b9c29dd112bbf98febe1854588ff7e04d.tar.bz2 | |
Fixes to net/ to compile on VS2013
Add #includes of <algorithm> for std::min/max.
R=rsleevi@chromium.org
BUG=288948
Review URL: https://codereview.chromium.org/27060002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228295 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/gzip_header.cc | 2 | ||||
| -rw-r--r-- | net/http/http_chunked_decoder.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/cubic.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/fix_rate_sender.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/hybrid_slow_start.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/inter_arrival_bitrate_ramp_up.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/inter_arrival_overuse_detector.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/paced_sender.cc | 2 | ||||
| -rw-r--r-- | net/quic/congestion_control/tcp_cubic_sender.cc | 2 | ||||
| -rw-r--r-- | net/quic/quic_utils.cc | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/net/base/gzip_header.cc b/net/base/gzip_header.cc index 81cb1d8..88ad4d7 100644 --- a/net/base/gzip_header.cc +++ b/net/base/gzip_header.cc @@ -4,6 +4,8 @@ #include "net/base/gzip_header.h" +#include <algorithm> + #include "base/logging.h" #include "third_party/zlib/zlib.h" diff --git a/net/http/http_chunked_decoder.cc b/net/http/http_chunked_decoder.cc index ca07f24..0d8be9f 100644 --- a/net/http/http_chunked_decoder.cc +++ b/net/http/http_chunked_decoder.cc @@ -44,6 +44,8 @@ #include "net/http/http_chunked_decoder.h" +#include <algorithm> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" diff --git a/net/quic/congestion_control/cubic.cc b/net/quic/congestion_control/cubic.cc index 04b1e93..16bfd1b 100644 --- a/net/quic/congestion_control/cubic.cc +++ b/net/quic/congestion_control/cubic.cc @@ -4,6 +4,8 @@ #include "net/quic/congestion_control/cubic.h" +#include <algorithm> + #include "base/basictypes.h" #include "base/logging.h" #include "base/time/time.h" diff --git a/net/quic/congestion_control/fix_rate_sender.cc b/net/quic/congestion_control/fix_rate_sender.cc index c14f2b5..082264d 100644 --- a/net/quic/congestion_control/fix_rate_sender.cc +++ b/net/quic/congestion_control/fix_rate_sender.cc @@ -6,6 +6,8 @@ #include <math.h> +#include <algorithm> + #include "base/logging.h" #include "net/quic/quic_protocol.h" diff --git a/net/quic/congestion_control/hybrid_slow_start.cc b/net/quic/congestion_control/hybrid_slow_start.cc index eee96ad..d6edba8 100644 --- a/net/quic/congestion_control/hybrid_slow_start.cc +++ b/net/quic/congestion_control/hybrid_slow_start.cc @@ -4,6 +4,8 @@ #include "net/quic/congestion_control/hybrid_slow_start.h" +#include <algorithm> + namespace net { // Note(pwestin): the magic clamping numbers come from the original code in diff --git a/net/quic/congestion_control/inter_arrival_bitrate_ramp_up.cc b/net/quic/congestion_control/inter_arrival_bitrate_ramp_up.cc index 0a15a74..2327c5c 100644 --- a/net/quic/congestion_control/inter_arrival_bitrate_ramp_up.cc +++ b/net/quic/congestion_control/inter_arrival_bitrate_ramp_up.cc @@ -4,6 +4,8 @@ #include "net/quic/congestion_control/inter_arrival_bitrate_ramp_up.h" +#include <algorithm> + #include "base/basictypes.h" #include "base/logging.h" #include "net/quic/congestion_control/cube_root.h" diff --git a/net/quic/congestion_control/inter_arrival_overuse_detector.cc b/net/quic/congestion_control/inter_arrival_overuse_detector.cc index ea1c3af..a2e3a0f 100644 --- a/net/quic/congestion_control/inter_arrival_overuse_detector.cc +++ b/net/quic/congestion_control/inter_arrival_overuse_detector.cc @@ -7,6 +7,8 @@ #include <math.h> #include <stdlib.h> +#include <algorithm> + // Initial noise variance, equal to a standard deviation of 1 millisecond. static const float kInitialVarianceNoise = 1000000.0; diff --git a/net/quic/congestion_control/paced_sender.cc b/net/quic/congestion_control/paced_sender.cc index 01b4810..8de5437 100644 --- a/net/quic/congestion_control/paced_sender.cc +++ b/net/quic/congestion_control/paced_sender.cc @@ -4,6 +4,8 @@ #include "net/quic/congestion_control/paced_sender.h" +#include <algorithm> + #include "net/quic/quic_protocol.h" namespace net { diff --git a/net/quic/congestion_control/tcp_cubic_sender.cc b/net/quic/congestion_control/tcp_cubic_sender.cc index 95047de..ef34e3f 100644 --- a/net/quic/congestion_control/tcp_cubic_sender.cc +++ b/net/quic/congestion_control/tcp_cubic_sender.cc @@ -4,6 +4,8 @@ #include "net/quic/congestion_control/tcp_cubic_sender.h" +#include <algorithm> + namespace net { namespace { diff --git a/net/quic/quic_utils.cc b/net/quic/quic_utils.cc index cfb3cb7..6e61c41 100644 --- a/net/quic/quic_utils.cc +++ b/net/quic/quic_utils.cc @@ -6,6 +6,8 @@ #include <ctype.h> +#include <algorithm> + #include "base/logging.h" #include "base/port.h" #include "base/strings/stringprintf.h" |