| Index: net/spdy/hpack_encoder.cc
|
| diff --git a/net/spdy/hpack_encoder.cc b/net/spdy/hpack_encoder.cc
|
| index bc56efefbc883b040054e7f6416f4b24f97899dc..fe95593f53b757f6aeaff63b0c695d9f0d4c30ad 100644
|
| --- a/net/spdy/hpack_encoder.cc
|
| +++ b/net/spdy/hpack_encoder.cc
|
| @@ -169,14 +169,11 @@ void HpackEncoder::CookieToCrumbs(const Representation& cookie,
|
| size_t end = cookie.second.find(";", pos);
|
|
|
| if (end == StringPiece::npos) {
|
| - out->push_back(make_pair(
|
| - cookie.first,
|
| - cookie.second.substr(pos)));
|
| + out->push_back(std::make_pair(cookie.first, cookie.second.substr(pos)));
|
| break;
|
| }
|
| - out->push_back(make_pair(
|
| - cookie.first,
|
| - cookie.second.substr(pos, end - pos)));
|
| + out->push_back(
|
| + std::make_pair(cookie.first, cookie.second.substr(pos, end - pos)));
|
|
|
| // Consume next space if present.
|
| pos = end + 1;
|
| @@ -197,8 +194,8 @@ void HpackEncoder::DecomposeRepresentation(const Representation& header_field,
|
| size_t end = 0;
|
| while (end != StringPiece::npos) {
|
| end = header_field.second.find('\0', pos);
|
| - out->push_back(make_pair(header_field.first,
|
| - header_field.second.substr(pos, end - pos)));
|
| + out->push_back(std::make_pair(header_field.first,
|
| + header_field.second.substr(pos, end - pos)));
|
| pos = end + 1;
|
| }
|
| }
|
|
|