summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjin-gyu.kim <jin-gyu.kim@samsung.com>2016-12-16 17:18:57 +0900
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2017-01-02 06:44:31 -0800
commit3e0dfbac3c83e3c71796b9d20f9c537833e1ea8e (patch)
tree0058edbf5ca32733d8e0ed81312bb9be347639f0
parenteab42d4508e6cc5b550a5f54f1570f8ca84099ec (diff)
downloadsecurity-manager-3e0dfbac3c83e3c71796b9d20f9c537833e1ea8e.tar.gz
security-manager-3e0dfbac3c83e3c71796b9d20f9c537833e1ea8e.tar.bz2
security-manager-3e0dfbac3c83e3c71796b9d20f9c537833e1ea8e.zip
Change auto_ptr to unique_ptr.
- Using auto_ptr causes warning in gnu11. Change-Id: I89c09f29478639d9de9ad29edde62971754eb25e
-rw-r--r--src/dpl/core/include/dpl/binary_queue.h4
-rw-r--r--src/dpl/core/src/binary_queue.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/dpl/core/include/dpl/binary_queue.h b/src/dpl/core/include/dpl/binary_queue.h
index 19a5b7be..88dc669a 100644
--- a/src/dpl/core/include/dpl/binary_queue.h
+++ b/src/dpl/core/include/dpl/binary_queue.h
@@ -32,7 +32,7 @@ namespace SecurityManager {
* Binary queue auto pointer
*/
class BinaryQueue;
-typedef std::auto_ptr<BinaryQueue> BinaryQueueAutoPtr;
+typedef std::unique_ptr<BinaryQueue> BinaryQueueUniquePtr;
/**
* Binary stream implemented as constant size bucket list
@@ -284,7 +284,7 @@ class BinaryQueue
/**
* IAbstractInput interface
*/
- virtual BinaryQueueAutoPtr Read(size_t size);
+ virtual BinaryQueueUniquePtr Read(size_t size);
/**
* IAbstractOutput interface
diff --git a/src/dpl/core/src/binary_queue.cpp b/src/dpl/core/src/binary_queue.cpp
index 72817a67..44a11c42 100644
--- a/src/dpl/core/src/binary_queue.cpp
+++ b/src/dpl/core/src/binary_queue.cpp
@@ -286,7 +286,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);
@@ -298,7 +298,7 @@ BinaryQueueAutoPtr BinaryQueue::Read(size_t size)
throw std::bad_alloc();
}
- BinaryQueueAutoPtr result(new BinaryQueue());
+ BinaryQueueUniquePtr result(new BinaryQueue());
Flatten(bufferCopy.get(), available);
result->AppendUnmanaged(