Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: net/socket/tcp_server_socket.cc

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/tcp_client_socket.cc ('k') | net/socket/transport_client_socket_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/tcp_server_socket.cc
diff --git a/net/socket/tcp_server_socket.cc b/net/socket/tcp_server_socket.cc
index 5b1ad659d20ede4a4db31acef22081704ded6cb1..06f751220331da21cf9ddf6416b90da5333f95fc 100644
--- a/net/socket/tcp_server_socket.cc
+++ b/net/socket/tcp_server_socket.cc
@@ -4,6 +4,8 @@
#include "net/socket/tcp_server_socket.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
@@ -87,12 +89,12 @@ int TCPServerSocket::ConvertAcceptedSocket(
int result,
scoped_ptr<StreamSocket>* output_accepted_socket) {
// Make sure the TCPSocket object is destroyed in any case.
- scoped_ptr<TCPSocket> temp_accepted_socket(accepted_socket_.Pass());
+ scoped_ptr<TCPSocket> temp_accepted_socket(std::move(accepted_socket_));
if (result != OK)
return result;
- output_accepted_socket->reset(new TCPClientSocket(
- temp_accepted_socket.Pass(), accepted_address_));
+ output_accepted_socket->reset(
+ new TCPClientSocket(std::move(temp_accepted_socket), accepted_address_));
return OK;
}
« no previous file with comments | « net/socket/tcp_client_socket.cc ('k') | net/socket/transport_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698