summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJamie Liu <jamieliu@google.com>2019-01-24 12:16:54 -0800
committerShentubot <shentubot@google.com>2019-01-24 12:18:10 -0800
commit79e0451bd11645b0dff34c3a6c6131ed68c822f7 (patch)
tree38d3b3c62f1ceb8a2567f24272f167afb6b73563
parent74f5100a92854bb244f560847cd8f459a8a06688 (diff)
Explicitly std::move() returned std::vector<Mapping>.
Otherwise, C++11-compliant compilers may select PosixErrorOr(const T&) as the relevant constructor, and fail because std::vector<Mapping> is not copyable (because Mapping is not copyable). This is a C++11 defect that is fixed in C++14 (and in C++11 mode for Clang, but not GCC). See DR 1579, http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579. PiperOrigin-RevId: 230767401 Change-Id: I65f481f5188d91db6cbbbd65ed0a60bc55df3401
-rw-r--r--test/syscalls/linux/socket_unix_non_stream.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/syscalls/linux/socket_unix_non_stream.cc b/test/syscalls/linux/socket_unix_non_stream.cc
index 264b7fe6a..a84939011 100644
--- a/test/syscalls/linux/socket_unix_non_stream.cc
+++ b/test/syscalls/linux/socket_unix_non_stream.cc
@@ -106,7 +106,7 @@ PosixErrorOr<std::vector<Mapping>> CreateFragmentedRegion(const int size,
// The mappings above have taken ownership of the region.
region.release();
- return pages;
+ return std::move(pages);
}
// A contiguous iov that is heavily fragmented in FileMem can still be sent