projects
/
framework
/
web
/
wrt-commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tizen 2.4 release
[framework/web/wrt-commons.git]
/
modules
/
core
/
src
/
binary_queue.cpp
diff --git
a/modules_wearable/core/src/binary_queue.cpp
b/modules/core/src/binary_queue.cpp
old mode 100644
(file)
new mode 100755
(executable)
similarity index 95%
rename from
modules_wearable/core/src/binary_queue.cpp
rename to
modules/core/src/binary_queue.cpp
index
2234c8f
..
25b0f68
--- a/
modules_wearable/core/src/binary_queue.cpp
+++ b/
modules/core/src/binary_queue.cpp
@@
-22,7
+22,8
@@
#include <stddef.h>
#include <dpl/binary_queue.h>
#include <dpl/assert.h>
#include <stddef.h>
#include <dpl/binary_queue.h>
#include <dpl/assert.h>
-#include <dpl/scoped_free.h>
+#include <dpl/free_deleter.h>
+#include <memory>
#include <algorithm>
#include <malloc.h>
#include <cstring>
#include <algorithm>
#include <malloc.h>
#include <cstring>
@@
-45,7
+46,7
@@
BinaryQueue::~BinaryQueue()
Clear();
}
Clear();
}
-
const
BinaryQueue &BinaryQueue::operator=(const BinaryQueue &other)
+BinaryQueue &BinaryQueue::operator=(const BinaryQueue &other)
{
if (this != &other) {
Clear();
{
if (this != &other) {
Clear();
@@
-286,7
+287,7
@@
BinaryQueueAutoPtr BinaryQueue::Read(size_t size)
// Simulate input stream
size_t available = std::min(size, m_size);
// Simulate input stream
size_t available = std::min(size, m_size);
-
ScopedFree<void
> bufferCopy(malloc(available));
+
std::unique_ptr<void,free_deleter
> bufferCopy(malloc(available));
if (!bufferCopy) {
throw std::bad_alloc();
if (!bufferCopy) {
throw std::bad_alloc();
@@
-294,10
+295,10
@@
BinaryQueueAutoPtr BinaryQueue::Read(size_t size)
BinaryQueueAutoPtr result(new BinaryQueue());
BinaryQueueAutoPtr result(new BinaryQueue());
- Flatten(bufferCopy.
G
et(), available);
+ Flatten(bufferCopy.
g
et(), available);
result->AppendUnmanaged(
result->AppendUnmanaged(
- bufferCopy.
G
et(), available, &BufferDeleterFree, NULL);
- bufferCopy.
R
elease();
+ bufferCopy.
g
et(), available, &BufferDeleterFree, NULL);
+ bufferCopy.
r
elease();
Consume(available);
return result;
Consume(available);
return result;