diff options
| author | dcheng <dcheng@chromium.org> | 2016-03-02 15:20:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 23:21:51 +0000 |
| commit | 70c494273fa71d922405cba4dc39f5457652a2db (patch) | |
| tree | 9285f262fe33d8a3d4d9f36f8cd8244caa568ef7 /net/socket | |
| parent | 063be11909af7bd64a575259b5ff01eb0686e287 (diff) | |
| download | chromium_src-70c494273fa71d922405cba4dc39f5457652a2db.zip chromium_src-70c494273fa71d922405cba4dc39f5457652a2db.tar.gz chromium_src-70c494273fa71d922405cba4dc39f5457652a2db.tar.bz2 | |
Convert Pass()→std::move() on Windows
Also cleaned up a few stragglers from grepping the source: it's unclear
if these are just building with weird defines, don't build at all, only
build on obscure platforms, or something else… either way, Pass()
itself will be removed shortly after this.
BUG=557422
Review URL: https://codereview.chromium.org/1752233002
Cr-Commit-Position: refs/heads/master@{#378872}
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/tcp_socket_win.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc index 827dd72..0d11a0d 100644 --- a/net/socket/tcp_socket_win.cc +++ b/net/socket/tcp_socket_win.cc @@ -8,6 +8,8 @@ #include <errno.h> #include <mstcpip.h> +#include <utility> + #include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/logging.h" @@ -704,7 +706,7 @@ int TCPSocketWin::AcceptInternal(scoped_ptr<TCPSocketWin>* socket, net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, adopt_result); return adopt_result; } - *socket = tcp_socket.Pass(); + *socket = std::move(tcp_socket); *address = ip_end_point; net_log_.EndEvent(NetLog::TYPE_TCP_ACCEPT, CreateNetLogIPEndPointCallback(&ip_end_point)); |