Merge pull request #19896 from tchaikov/wip-vive-cxx-17

msg/simple: s/ceph::size/std::size/

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Kefu Chai 2018-01-15 11:27:28 +08:00 committed by GitHub
commit 9a9a00cb3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,6 +13,7 @@
*/
#include "include/compat.h"
#include <iterator>
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <sys/uio.h>
@ -59,7 +60,7 @@ int Accepter::create_selfpipe(int *pipe_rd, int *pipe_wr) {
#else
int ret = ::pipe(selfpipe);
if (ret == 0) {
for (int i = 0; i < ceph::size(selfpipe); i++) {
for (int i = 0; i < std::size(selfpipe); i++) {
int f = fcntl(selfpipe[i], F_GETFD);
fcntl(selfpipe[i], F_SETFD, f | FD_CLOEXEC | O_NONBLOCK);
}