tizen 2.4 release

[framework/web/wrt-commons.git] / modules / rpc / include / dpl / rpc / rpc_function.h

diff --git a/modules_mobile/rpc/include/dpl/rpc/rpc_function.h b/modules/rpc/include/dpl/rpc/rpc_function.h
similarity index 96%
rename from modules_mobile/rpc/include/dpl/rpc/rpc_function.h
rename to modules/rpc/include/dpl/rpc/rpc_function.h
index a01235f..1166406 100644 (file)
--- a/modules_mobile/rpc/include/dpl/rpc/rpc_function.h
+++ b/modules/rpc/include/dpl/rpc/rpc_function.h
@@ -24,10 +24,10 @@
 
 #include <dpl/exception.h>
 #include <dpl/binary_queue.h>
-#include <dpl/scoped_array.h>
 #include <dpl/string.h>
 #include <dpl/serialization.h>
 #include <string>
+#include <memory>
 
 namespace DPL {
 namespace RPC {
@@ -150,9 +150,9 @@ class RPCFunction : public IStream
         {
             std::string::size_type size;
             m_buffer.FlattenConsume(&size, sizeof(size));
-            ScopedArray<char> str(new char[size]);
-            m_buffer.FlattenConsume(str.Get(), size);
-            arg = std::string(str.Get(), str.Get() + size);
+            std::unique_ptr<char[]> str(new char[size]);
+            m_buffer.FlattenConsume(str.get(), size);
+            arg = std::string(str.get(), str.get() + size);
         }
         Catch(BinaryQueue::Exception::OutOfData)
         {