tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix the missing std" am: 39337adcc9 am: a4ab908631 am: d65d1a6b64

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2468920

Change-Id: If2e904f1f3bb8a1a3b7b63d67ddbee2392baad7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-03-03 17:37:23 +00:00 committed by Automerger Merge Worker
commit c00be16811
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
automotive/can/1.0/default/libc++fs/src/filesystem/directory_iterator.cpp
View file

@ -169,8 +169,8 @@ public:
__dir_stream& operator=(const __dir_stream&) = delete;
__dir_stream(__dir_stream&& other) noexcept : __stream_(other.__stream_),
__root_(move(other.__root_)),
__entry_(move(other.__entry_)) {
__root_(std::move(other.__root_)),
__entry_(std::move(other.__entry_)) {
other.__stream_ = nullptr;
}
@ -252,7 +252,7 @@ directory_iterator& directory_iterator::__increment(error_code* ec) {
error_code m_ec;
if (!__imp_->advance(m_ec)) {
path root = move(__imp_->__root_);
path root = std::move(__imp_->__root_);
__imp_.reset();
if (m_ec)
err.report(m_ec, "at root \"%s\"", root);
@ -286,7 +286,7 @@ recursive_directory_iterator::recursive_directory_iterator(
__imp_ = make_shared<__shared_imp>();
__imp_->__options_ = opt;
__imp_->__stack_.push(move(new_s));
__imp_->__stack_.push(std::move(new_s));
}
void recursive_directory_iterator::__pop(error_code* ec) {
@ -340,7 +340,7 @@ void recursive_directory_iterator::__advance(error_code* ec) {
}
if (m_ec) {
path root = move(stack.top().__root_);
path root = std::move(stack.top().__root_);
__imp_.reset();
err.report(m_ec, "at root \"%s\"", root);
} else {
@ -374,7 +374,7 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) {
if (!skip_rec) {
__dir_stream new_it(curr_it.__entry_.path(), __imp_->__options_, m_ec);
if (new_it.good()) {
__imp_->__stack_.push(move(new_it));
__imp_->__stack_.push(std::move(new_it));
return true;
}
}
@ -385,7 +385,7 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) {
if (ec)
ec->clear();
} else {
path at_ent = move(curr_it.__entry_.__p_);
path at_ent = std::move(curr_it.__entry_.__p_);
__imp_.reset();
err.report(m_ec, "attempting recursion into \"%s\"", at_ent);
}

2
tv/tuner/1.0/default/Dvr.cpp
View file

@ -164,7 +164,7 @@ bool Dvr::createDvrMQ() {
return false;
}
mDvrMQ = move(tmpDvrMQ);
mDvrMQ = std::move(tmpDvrMQ);
if (EventFlag::createEventFlag(mDvrMQ->getEventFlagWord(), &mDvrEventFlag) != OK) {
return false;

2
tv/tuner/1.1/default/Dvr.cpp
View file

@ -183,7 +183,7 @@ bool Dvr::createDvrMQ() {
return false;
}
mDvrMQ = move(tmpDvrMQ);
mDvrMQ = std::move(tmpDvrMQ);
if (EventFlag::createEventFlag(mDvrMQ->getEventFlagWord(), &mDvrEventFlag) != OK) {
return false;

6
usb/gadget/1.1/default/lib/MonitorFfs.cpp
View file

@ -59,9 +59,9 @@ MonitorFfs::MonitorFfs(const char* const gadget)
if (addEpollFd(epollFd, eventFd) == -1) abort();
mEpollFd = move(epollFd);
mInotifyFd = move(inotifyFd);
mEventFd = move(eventFd);
mEpollFd = std::move(epollFd);
mInotifyFd = std::move(inotifyFd);
mEventFd = std::move(eventFd);
gadgetPullup = false;
}

6
usb/gadget/1.2/default/lib/MonitorFfs.cpp
View file

@ -59,9 +59,9 @@ MonitorFfs::MonitorFfs(const char* const gadget)
if (addEpollFd(epollFd, eventFd) == -1) abort();
mEpollFd = move(epollFd);
mInotifyFd = move(inotifyFd);
mEventFd = move(eventFd);
mEpollFd = std::move(epollFd);
mInotifyFd = std::move(inotifyFd);
mEventFd = std::move(eventFd);
gadgetPullup = false;
}