summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2023-03-09 10:06:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-09 10:06:11 +0000
commit76572d05c0e0f59ff6ecfa7d5a0f5b25a98f08fc (patch)
treec50c4597de212e257ca213aae0301c65238a10c7
parentcf95081c97c7207c12fe2447932b44ae9e191cbf (diff)
parentf4638a4588e316f718cf319715c3c993e04fd170 (diff)
downloadpixel-temp_273316506_tm-qpr2.tar.gz
Fix unqualified-std-cast-call compiler warning am: f4638a4588temp_273316506_tm-qpr2
Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel/+/2479455 Change-Id: I9ff6243172e1295549514d1bb3f57363c368b495 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--usb/MonitorFfs.cpp6
-rw-r--r--usb/UsbOverheatEvent.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/usb/MonitorFfs.cpp b/usb/MonitorFfs.cpp
index 7a5ad9d2..bcf9f25b 100644
--- a/usb/MonitorFfs.cpp
+++ b/usb/MonitorFfs.cpp
@@ -65,9 +65,9 @@ MonitorFfs::MonitorFfs(const char *const gadget, const char *const extconTypecSt
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;
}
diff --git a/usb/UsbOverheatEvent.cpp b/usb/UsbOverheatEvent.cpp
index a80f8b22..8b47d67e 100644
--- a/usb/UsbOverheatEvent.cpp
+++ b/usb/UsbOverheatEvent.cpp
@@ -88,9 +88,9 @@ UsbOverheatEvent::UsbOverheatEvent(const ZoneInfo &monitored_zone,
abort();
}
- epoll_fd_ = move(epollFd);
- timer_fd_ = move(timerFd);
- event_fd_ = move(eventFd);
+ epoll_fd_ = std::move(epollFd);
+ timer_fd_ = std::move(timerFd);
+ event_fd_ = std::move(eventFd);
monitor_ = unique_ptr<thread>(new thread(this->monitorThread, this));
registerListener();