diff options
| author | Elliott Hughes <enh@google.com> | 2016-09-13 15:11:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-13 15:11:59 +0000 |
| commit | 3938812d5b9f2cc86cca8048ac0a77a5c7d962a9 (patch) | |
| tree | 04b55a783346d0015c905026e3bdb2bf6d82a994 | |
| parent | b6a4f4bf73aee696e430d0aa8684913374c8789b (diff) | |
| parent | 43fec02506fc163a232af191d0d5460d994eae91 (diff) | |
| download | nvram-3938812d5b9f2cc86cca8048ac0a77a5c7d962a9.tar.gz | |
Switch system/nvram to std::unique_ptr.
am: 43fec02506
Change-Id: I366d1f8038af59994ab67dc2122deaa3d5d460dd
| -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 |