From 313c07cca036472f493243263c4b3b6578f6361b Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Fri, 6 Feb 2015 16:46:10 +0100
Subject: corrected attributes default value.

---
 src/core/model/Document.hpp             | 23 ++++++++++++++---------
 test/core/model/TestDocumentBuilder.hpp | 20 ++++++++------------
 2 files changed, 22 insertions(+), 21 deletions(-)

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<Node> subInst, Handle<Descriptor> descriptor,
-	               Variant attributes = {});
+	               Variant attributes);
 
 	/**
 	 * Returns the Descriptor for this DocumentEntity.
@@ -390,7 +390,8 @@ public:
 	 * @return           the newly created StructuredEntity.
 	 */
 	Rooted<StructuredEntity> createChildStructuredEntity(
-	    Handle<StructuredClass> descriptor, Variant attributes = {},
+	    Handle<StructuredClass> descriptor,
+	    Variant attributes = Variant::mapType{},
 	    const std::string &fieldName = DEFAULT_FIELD_NAME,
 	    std::string name = "");
 	/*
@@ -478,7 +479,7 @@ public:
 	 */
 	StructuredEntity(Manager &mgr, Handle<Node> parent,
 	                 Handle<StructuredClass> 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<Document> doc,
 	                 Handle<StructuredClass> 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<Node> parent = nullptr,
 	                 Handle<StructuredClass> descriptor = nullptr,
-	                 Variant attributes = {}, std::string name = "");
+	                 Variant attributes = Variant::mapType{},
+	                 std::string name = "");
 };
 
 /**
@@ -657,7 +660,8 @@ public:
 	AnnotationEntity(Manager &mgr, Handle<Document> parent = nullptr,
 	                 Handle<AnnotationClass> descriptor = nullptr,
 	                 Handle<Anchor> start = nullptr,
-	                 Handle<Anchor> end = nullptr, Variant attributes = {},
+	                 Handle<Anchor> end = nullptr,
+	                 Variant attributes = Variant::mapType{},
 	                 std::string name = "");
 
 	/**
@@ -753,8 +757,8 @@ public:
 	 * @return           the newly constructed StructuredEntity.
 	 */
 	Rooted<StructuredEntity> createRootStructuredEntity(
-	    Handle<StructuredClass> descriptor, Variant attributes = {},
-	    std::string name = "");
+	    Handle<StructuredClass> descriptor,
+	    Variant attributes = Variant::mapType{}, std::string name = "");
 
 	/**
 	 * Returns a const reference to the NodeVector of AnnotationEntities that
@@ -812,7 +816,8 @@ public:
 	 */
 	Rooted<AnnotationEntity> createChildAnnotation(
 	    Handle<AnnotationClass> descriptor, Handle<Anchor> start,
-	    Handle<Anchor> end, Variant attributes = {}, std::string name = "");
+	    Handle<Anchor> end, Variant attributes = Variant::mapType{},
+	    std::string name = "");
 
 	/**
 	 * Returns a const reference to the NodeVector of Domains that are used
diff --git a/test/core/model/TestDocumentBuilder.hpp b/test/core/model/TestDocumentBuilder.hpp
index 05b27b7..3d24839 100644
--- a/test/core/model/TestDocumentBuilder.hpp
+++ b/test/core/model/TestDocumentBuilder.hpp
@@ -84,11 +84,9 @@ static Rooted<Descriptor> resolveDescriptor(Handle<Document> doc,
  *                   input handle was empty or the given domains did not
  *                   contain a StructuredClass with the given name.
  */
-Rooted<StructuredEntity> buildRootStructuredEntity(Handle<Document> document,
-                                                   Logger &logger,
-                                                   const Path &path,
-                                                   Variant attributes = {},
-                                                   std::string name = "")
+Rooted<StructuredEntity> buildRootStructuredEntity(
+    Handle<Document> document, Logger &logger, const Path &path,
+    Variant attributes = Variant::mapType{}, std::string name = "")
 {
 	// If the parent is not set, we can not build the entity.
 	if (document == nullptr) {
@@ -134,7 +132,7 @@ Rooted<StructuredEntity> buildRootStructuredEntity(Handle<Document> document,
 Rooted<StructuredEntity> buildStructuredEntity(
     Handle<Document> document, Logger &logger, Handle<StructuredEntity> parent,
     Path path, const std::string &fieldName = DEFAULT_FIELD_NAME,
-    Variant attributes = {}, std::string name = "")
+    Variant attributes = Variant::mapType{}, std::string name = "")
 {
 	// If the input handles are not set, we can not build the entity.
 	if (parent == nullptr) {
@@ -184,12 +182,10 @@ Rooted<StructuredEntity> buildStructuredEntity(
  *                   input handle was empty or the given domains did not
  *                   contain a AnnotationClass with the given name.
  */
-Rooted<AnnotationEntity> buildAnnotationEntity(Handle<Document> document,
-                                               Logger &logger, const Path &path,
-                                               Handle<Anchor> start,
-                                               Handle<Anchor> end,
-                                               Variant attributes = {},
-                                               std::string name = "")
+Rooted<AnnotationEntity> buildAnnotationEntity(
+    Handle<Document> document, Logger &logger, const Path &path,
+    Handle<Anchor> start, Handle<Anchor> end,
+    Variant attributes = Variant::mapType{}, std::string name = "")
 {
 	// If the input handles are not set, we can not build the entity.
 	if (document == nullptr) {
-- 
cgit v1.2.3