summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
Diffstat (limited to 'device')
-rw-r--r--device/serial/serial_device_enumerator_win.cc12
-rw-r--r--device/serial/serial_io_handler_win.cc4
2 files changed, 8 insertions, 8 deletions
diff --git a/device/serial/serial_device_enumerator_win.cc b/device/serial/serial_device_enumerator_win.cc
index fe735af..79c4001 100644
--- a/device/serial/serial_device_enumerator_win.cc
+++ b/device/serial/serial_device_enumerator_win.cc
@@ -93,7 +93,7 @@ mojo::Array<serial::DeviceInfoPtr> GetDevicesNew() {
HDEVINFO dev_info =
SetupDiGetClassDevs(&GUID_DEVCLASS_PORTS, 0, 0, DIGCF_PRESENT);
if (dev_info == INVALID_HANDLE_VALUE)
- return devices.Pass();
+ return devices;
SP_DEVINFO_DATA dev_info_data;
dev_info_data.cbSize = sizeof(SP_DEVINFO_DATA);
@@ -128,11 +128,11 @@ mojo::Array<serial::DeviceInfoPtr> GetDevicesNew() {
}
}
- devices.push_back(info.Pass());
+ devices.push_back(std::move(info));
}
SetupDiDestroyDeviceInfoList(dev_info);
- return devices.Pass();
+ return devices;
}
// Returns an array of devices as retrieved through the old method of
@@ -145,9 +145,9 @@ mojo::Array<serial::DeviceInfoPtr> GetDevicesOld() {
for (; iter_key.Valid(); ++iter_key) {
serial::DeviceInfoPtr info(serial::DeviceInfo::New());
info->path = base::UTF16ToASCII(iter_key.Value());
- devices.push_back(info.Pass());
+ devices.push_back(std::move(info));
}
- return devices.Pass();
+ return devices;
}
} // namespace
@@ -186,7 +186,7 @@ mojo::Array<serial::DeviceInfoPtr> SerialDeviceEnumeratorWin::GetDevices() {
mojo::Array<serial::DeviceInfoPtr> devices;
deviceMap.DecomposeMapTo(&paths, &devices);
- return devices.Pass();
+ return devices;
}
} // namespace device
diff --git a/device/serial/serial_io_handler_win.cc b/device/serial/serial_io_handler_win.cc
index f95c3a0..dec9450 100644
--- a/device/serial/serial_io_handler_win.cc
+++ b/device/serial/serial_io_handler_win.cc
@@ -477,7 +477,7 @@ serial::DeviceControlSignalsPtr SerialIoHandlerWin::GetControlSignals() const {
signals->cts = (status & MS_CTS_ON) != 0;
signals->dsr = (status & MS_DSR_ON) != 0;
signals->ri = (status & MS_RING_ON) != 0;
- return signals.Pass();
+ return signals;
}
bool SerialIoHandlerWin::SetControlSignals(
@@ -512,7 +512,7 @@ serial::ConnectionInfoPtr SerialIoHandlerWin::GetPortInfo() const {
info->parity_bit = ParityBitConstantToEnum(config.Parity);
info->stop_bits = StopBitsConstantToEnum(config.StopBits);
info->cts_flow_control = config.fOutxCtsFlow != 0;
- return info.Pass();
+ return info;
}
bool SerialIoHandlerWin::SetBreak() {