X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/eb3d5c6416c0f0d1cad35e52af3231de7866fea8..26ade07ab0e62b98b452fbbd18edba0450035e35:/rpc/connection.cc?ds=sidebyside diff --git a/rpc/connection.cc b/rpc/connection.cc index c2635ef..d118539 100644 --- a/rpc/connection.cc +++ b/rpc/connection.cc @@ -9,7 +9,7 @@ connection_delegate::~connection_delegate() {} connection::connection(connection_delegate * delegate, socket_t && f1, int l1) -: fd(move(f1)), delegate_(delegate), lossy_(l1) +: fd(std::move(f1)), delegate_(delegate), lossy_(l1) { fd.flags() |= O_NONBLOCK; @@ -42,7 +42,7 @@ shared_ptr connection::to_dst(const sockaddr_in & dst, connection_de return nullptr; } IF_LEVEL(2) LOG_NONMEMBER << "connection::to_dst fd=" << s << " to dst " << inet_ntoa(dst.sin_addr) << ":" << ntoh(dst.sin_port); - return make_shared(delegate, move(s), lossy); + return make_shared(delegate, std::move(s), lossy); } bool connection::send(const string & b) { @@ -173,7 +173,7 @@ bool connection::readpdu() { size_t sz = ntoh(sz1); if (sz > rpc_protocol::MAX_PDU) { - IF_LEVEL(2) LOG << "read pdu TOO BIG " << sz << " network order=" << hex << sz1; + IF_LEVEL(2) LOG << "read pdu TOO BIG " << sz << " network order=" << std::hex << sz1; return false; }