diff options
| author | Elliott Hughes <enh@google.com> | 2016-09-13 15:48:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-13 15:48:06 +0000 |
| commit | 0af1e8bc3a3afb480d9e0f42a3e40ba52106c5f9 (patch) | |
| tree | 04b55a783346d0015c905026e3bdb2bf6d82a994 | |
| parent | f83ea304593037b14e20aed621ee370e42feff16 (diff) | |
| parent | ad01045da842faa568d24ea2523dea44143d1274 (diff) | |
| download | nvram-0af1e8bc3a3afb480d9e0f42a3e40ba52106c5f9.tar.gz | |
Switch system/nvram to std::unique_ptr. am: 43fec02506 am: 3938812d5b am: 78378c33a0
am: ad01045da8
Change-Id: I3035b08be83f6a9d905a3d7c375e4dc0f155ee29
| -rw-r--r-- | hal/include/nvram/hal/nvram_device_adapter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hal/include/nvram/hal/nvram_device_adapter.h b/hal/include/nvram/hal/nvram_device_adapter.h index b99ab9c..107c1f7 100644 --- a/hal/include/nvram/hal/nvram_device_adapter.h +++ b/hal/include/nvram/hal/nvram_device_adapter.h @@ -17,7 +17,7 @@ #ifndef NVRAM_HAL_NVRAM_DEVICE_ADAPTER_H_ #define NVRAM_HAL_NVRAM_DEVICE_ADAPTER_H_ -#include <UniquePtr.h> +#include <memory> #include <hardware/nvram.h> #include <nvram/messages/nvram_messages.h> @@ -53,7 +53,7 @@ struct NvramDeviceAdapter { private: nvram_device_t device_; - UniquePtr<NvramImplementation> implementation_; + std::unique_ptr<NvramImplementation> implementation_; }; // Make sure |NvramDeviceAdapter| is a standard layout type. This guarantees |