From 313c07cca036472f493243263c4b3b6578f6361b Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Fri, 6 Feb 2015 16:46:10 +0100 Subject: corrected attributes default value. --- src/core/model/Document.hpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'src/core/model/Document.hpp') diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp index 5235006..cebf266 100644 --- a/src/core/model/Document.hpp +++ b/src/core/model/Document.hpp @@ -183,7 +183,7 @@ public: * in the given descriptor. */ DocumentEntity(Handle subInst, Handle descriptor, - Variant attributes = {}); + Variant attributes); /** * Returns the Descriptor for this DocumentEntity. @@ -390,7 +390,8 @@ public: * @return the newly created StructuredEntity. */ Rooted createChildStructuredEntity( - Handle descriptor, Variant attributes = {}, + Handle descriptor, + Variant attributes = Variant::mapType{}, const std::string &fieldName = DEFAULT_FIELD_NAME, std::string name = ""); /* @@ -478,7 +479,7 @@ public: */ StructuredEntity(Manager &mgr, Handle parent, Handle descriptor, - Variant attributes = {}, + Variant attributes = Variant::mapType{}, const std::string &fieldName = DEFAULT_FIELD_NAME, std::string name = "") : StructureNode(mgr, std::move(name), parent, fieldName), @@ -501,7 +502,8 @@ public: */ StructuredEntity(Manager &mgr, Handle doc, Handle descriptor, - Variant attributes = {}, std::string name = ""); + Variant attributes = Variant::mapType{}, + std::string name = ""); /** * Constructor for an empty StructuredEntity that is not yet connected. @@ -518,7 +520,8 @@ public: */ StructuredEntity(Manager &mgr, Handle parent = nullptr, Handle descriptor = nullptr, - Variant attributes = {}, std::string name = ""); + Variant attributes = Variant::mapType{}, + std::string name = ""); }; /** @@ -657,7 +660,8 @@ public: AnnotationEntity(Manager &mgr, Handle parent = nullptr, Handle descriptor = nullptr, Handle start = nullptr, - Handle end = nullptr, Variant attributes = {}, + Handle end = nullptr, + Variant attributes = Variant::mapType{}, std::string name = ""); /** @@ -753,8 +757,8 @@ public: * @return the newly constructed StructuredEntity. */ Rooted createRootStructuredEntity( - Handle descriptor, Variant attributes = {}, - std::string name = ""); + Handle descriptor, + Variant attributes = Variant::mapType{}, std::string name = ""); /** * Returns a const reference to the NodeVector of AnnotationEntities that @@ -812,7 +816,8 @@ public: */ Rooted createChildAnnotation( Handle descriptor, Handle start, - Handle end, Variant attributes = {}, std::string name = ""); + Handle end, Variant attributes = Variant::mapType{}, + std::string name = ""); /** * Returns a const reference to the NodeVector of Domains that are used -- cgit v1.2.3