diff options
| author | Kyungwook Tak <k.tak@samsung.com> | 2016-12-16 13:04:15 +0900 |
|---|---|---|
| committer | Kyungwook Tak <k.tak@samsung.com> | 2016-12-16 13:04:41 +0900 |
| commit | d798f17fd9f7982a998ad43f1eb40bf759e134a6 (patch) | |
| tree | 7612e10dc553f9b5a8c8bac78647b07d08215f9e | |
| parent | 0f1b2b060f31cc5b7abcb24fd8aae5ef4b9ad038 (diff) | |
| download | key-manager-d798f17fd9f7982a998ad43f1eb40bf759e134a6.tar.gz key-manager-d798f17fd9f7982a998ad43f1eb40bf759e134a6.tar.bz2 key-manager-d798f17fd9f7982a998ad43f1eb40bf759e134a6.zip | |
Replace deprecated auto_ptr with unique_ptr
Change-Id: Ib0ebc0f297f51a4cc3335a7d1c9033a37edea016
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
| -rw-r--r-- | src/manager/dpl/core/include/dpl/binary_queue.h | 4 | ||||
| -rw-r--r-- | src/manager/dpl/core/src/binary_queue.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/manager/dpl/core/include/dpl/binary_queue.h b/src/manager/dpl/core/include/dpl/binary_queue.h index 54c1c673..7dd928ed 100644 --- a/src/manager/dpl/core/include/dpl/binary_queue.h +++ b/src/manager/dpl/core/include/dpl/binary_queue.h @@ -34,7 +34,7 @@ namespace CKM { * Binary queue auto pointer */ class BinaryQueue; -typedef std::auto_ptr<BinaryQueue> BinaryQueueAutoPtr; +using BinaryQueueUniquePtr = std::unique_ptr<BinaryQueue>; /** * Binary stream implemented as constant size bucket list @@ -296,7 +296,7 @@ public: /** * IAbstractInput interface */ - virtual BinaryQueueAutoPtr Read(size_t size); + virtual BinaryQueueUniquePtr Read(size_t size); /** * IAbstractOutput interface diff --git a/src/manager/dpl/core/src/binary_queue.cpp b/src/manager/dpl/core/src/binary_queue.cpp index c469478e..36b174eb 100644 --- a/src/manager/dpl/core/src/binary_queue.cpp +++ b/src/manager/dpl/core/src/binary_queue.cpp @@ -285,7 +285,7 @@ void BinaryQueue::VisitBuckets(BucketVisitor *visitor) const std::for_each(m_buckets.begin(), m_buckets.end(), BucketVisitorCall(visitor)); } -BinaryQueueAutoPtr BinaryQueue::Read(size_t size) +BinaryQueueUniquePtr BinaryQueue::Read(size_t size) { // Simulate input stream size_t available = std::min(size, m_size); @@ -296,7 +296,7 @@ BinaryQueueAutoPtr BinaryQueue::Read(size_t size) if (!bufferCopy.get()) throw std::bad_alloc(); - BinaryQueueAutoPtr result(new BinaryQueue()); + BinaryQueueUniquePtr result(new BinaryQueue()); Flatten(bufferCopy.get(), available); result->AppendUnmanaged( |