Index: lib/Object_cpp.template |
diff --git a/lib/Object_cpp.template b/lib/Object_cpp.template |
index e3f18c3500e2b29422ec6db9f5f332e0e24fb471..46b0c94b2dddc3f95ceebd421620a48b85dca8c8 100644 |
--- a/lib/Object_cpp.template |
+++ b/lib/Object_cpp.template |
@@ -10,12 +10,13 @@ namespace {{namespace}} { |
std::unique_ptr<Object> Object::parse(protocol::Value* value, ErrorSupport* errors) |
{ |
- protocol::DictionaryValue* object = DictionaryValue::cast(value); |
- if (!object) { |
+ protocol::DictionaryValue* dictionary = DictionaryValue::cast(value); |
+ if (!dictionary) { |
errors->addError("object expected"); |
return nullptr; |
} |
- return wrapUnique(new Object(wrapUnique(static_cast<DictionaryValue*>(object->clone().release())))); |
+ dictionary = static_cast<protocol::DictionaryValue*>(dictionary->clone().release()); |
+ return std::unique_ptr<Object>(new Object(std::unique_ptr<DictionaryValue>(dictionary))); |
} |
std::unique_ptr<protocol::DictionaryValue> Object::serialize() const |
@@ -25,7 +26,7 @@ std::unique_ptr<protocol::DictionaryValue> Object::serialize() const |
std::unique_ptr<Object> Object::clone() const |
{ |
- return wrapUnique(new Object(DictionaryValue::cast(m_object->clone()))); |
+ return std::unique_ptr<Object>(new Object(DictionaryValue::cast(m_object->clone()))); |
} |
Object::Object(std::unique_ptr<protocol::DictionaryValue> object) : m_object(std::move(object)) { } |