diff options
| author | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 20:43:35 +0000 |
|---|---|---|
| committer | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 20:43:35 +0000 |
| commit | fd5e52232d30adfaf5849506612fe8797554d6fc (patch) | |
| tree | ac6af9112546f6de1478e0abc05a066c25f3b7a8 /net | |
| parent | 0dd8eba416f15251e7af1d98ca9b42fa4029ff5d (diff) | |
| download | chromium_src-fd5e52232d30adfaf5849506612fe8797554d6fc.zip chromium_src-fd5e52232d30adfaf5849506612fe8797554d6fc.tar.gz chromium_src-fd5e52232d30adfaf5849506612fe8797554d6fc.tar.bz2 | |
Eliminate no-arg constructor for CallbackResultPair
CID=102680
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/9023010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_session.cc | 4 | ||||
| -rw-r--r-- | net/spdy/spdy_session.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 596d569..c547d51 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -435,8 +435,8 @@ void SpdySession::ProcessPendingCreateStreams() { *pending_create.stream_net_log); scoped_refptr<SpdyStream>* stream = pending_create.spdy_stream; DCHECK(!ContainsKey(pending_callback_map_, stream)); - pending_callback_map_[stream] = - CallbackResultPair(pending_create.callback, error); + pending_callback_map_.insert(std::make_pair(stream, + CallbackResultPair(pending_create.callback, error))); MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&SpdySession::InvokeUserStreamCreationCallback, diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index 72fd8c2..1cdb7f7 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -276,7 +276,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>, typedef std::priority_queue<SpdyIOBuffer> OutputQueue; struct CallbackResultPair { - CallbackResultPair() : result(OK) {} CallbackResultPair(const CompletionCallback& callback_in, int result_in) : callback(callback_in), result(result_in) {} ~CallbackResultPair(); |