diff options
| author | dcheng <dcheng@chromium.org> | 2015-11-18 23:00:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 07:01:23 +0000 |
| commit | 0917ec4328dc20b59887d78f76b9f075e12e5f7f (patch) | |
| tree | e2e24def30f3b6619eb1b92d570b055bfcef9672 /device/hid | |
| parent | d076ca806251e4b636b421eb46ca04d14366b2cc (diff) | |
| download | chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.zip chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.gz chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.bz2 | |
Use std::default_delete as the default deleter for scoped_ptr.
The aim is to make scoped_ptr and std::unique_ptr functionally
identical so scoped_ptr can simply be a typedef.
BUG=554298
Review URL: https://codereview.chromium.org/1445003002
Cr-Commit-Position: refs/heads/master@{#360539}
Diffstat (limited to 'device/hid')
| -rw-r--r-- | device/hid/device_monitor_linux.h | 3 | ||||
| -rw-r--r-- | device/hid/input_service_linux.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/device/hid/device_monitor_linux.h b/device/hid/device_monitor_linux.h index 824fa65..23ad81a 100644 --- a/device/hid/device_monitor_linux.h +++ b/device/hid/device_monitor_linux.h @@ -5,6 +5,7 @@ #ifndef DEVICE_HID_DEVICE_MONITOR_LINUX_H_ #define DEVICE_HID_DEVICE_MONITOR_LINUX_H_ +#include <memory> #include <string> #include "base/compiler_specific.h" @@ -54,7 +55,7 @@ class DeviceMonitorLinux : public base::MessageLoop::DestructionObserver, void OnFileCanWriteWithoutBlocking(int fd) override; private: - friend struct base::DefaultDeleter<DeviceMonitorLinux>; + friend std::default_delete<DeviceMonitorLinux>; ~DeviceMonitorLinux() override; diff --git a/device/hid/input_service_linux.h b/device/hid/input_service_linux.h index d13be95..dfb11d1 100644 --- a/device/hid/input_service_linux.h +++ b/device/hid/input_service_linux.h @@ -5,6 +5,7 @@ #ifndef DEVICE_HID_INPUT_SERVICE_LINUX_H_ #define DEVICE_HID_INPUT_SERVICE_LINUX_H_ +#include <memory> #include <string> #include <vector> @@ -87,7 +88,7 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver { base::ObserverList<Observer> observers_; private: - friend struct base::DefaultDeleter<InputServiceLinux>; + friend std::default_delete<InputServiceLinux>; base::ThreadChecker thread_checker_; |