| Index: net/quic/core/quic_config.cc
|
| diff --git a/net/quic/core/quic_config.cc b/net/quic/core/quic_config.cc
|
| index 8dc68e96a6952c36268012638f12662fd1735302..8f147218b84ab35cff7f7d3afe548a56d18a4a23 100644
|
| --- a/net/quic/core/quic_config.cc
|
| +++ b/net/quic/core/quic_config.cc
|
| @@ -13,7 +13,6 @@
|
| #include "net/quic/core/quic_socket_address_coder.h"
|
| #include "net/quic/core/quic_utils.h"
|
|
|
| -using std::min;
|
| using std::string;
|
|
|
| namespace net {
|
| @@ -109,7 +108,7 @@ QuicErrorCode QuicNegotiableUint32::ProcessPeerHello(
|
| }
|
|
|
| set_negotiated(true);
|
| - negotiated_value_ = min(value, max_value_);
|
| + negotiated_value_ = std::min(value, max_value_);
|
| return QUIC_NO_ERROR;
|
| }
|
|
|
|
|