From c89e5c5ada36a528410ad9bb44d27012da85fa96 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Mon, 5 Jan 2015 00:15:49 +0100
Subject: Fixed compilation with gcc 4.9

---
 src/core/common/Rtti.hpp      |  1 +
 src/core/model/Domain.cpp     |  2 +-
 test/core/common/RttiTest.cpp | 11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/core/common/Rtti.hpp b/src/core/common/Rtti.hpp
index deaf128..ab937f5 100644
--- a/src/core/common/Rtti.hpp
+++ b/src/core/common/Rtti.hpp
@@ -251,6 +251,7 @@ inline const RttiBase &typeOf(const T &obj)
 }
 
 namespace RttiTypes {
+
 /**
  * Type of no particular type.
  */
diff --git a/src/core/model/Domain.cpp b/src/core/model/Domain.cpp
index e9c2687..41f2b76 100644
--- a/src/core/model/Domain.cpp
+++ b/src/core/model/Domain.cpp
@@ -89,7 +89,7 @@ const Rtti<model::StructuredClass> StructuredClass{
 const Rtti<model::AnnotationClass> AnnotationClass{"AnnotationClass",
                                                    {&Descriptor}};
 const Rtti<model::Domain> Domain{
-    "Domain", {}, {&StructuredClass, &AnnotationClass}};
+    "Domain", std::unordered_set<const RttiBase*>{}, {&StructuredClass, &AnnotationClass}};
 }
 }
 
diff --git a/test/core/common/RttiTest.cpp b/test/core/common/RttiTest.cpp
index e875efa..1154fb5 100644
--- a/test/core/common/RttiTest.cpp
+++ b/test/core/common/RttiTest.cpp
@@ -49,9 +49,14 @@ const Rtti<RttiTestClass1> Type1("Type1");
 const Rtti<RttiTestClass2> Type2("Type2");
 const Rtti<RttiTestClass3> Type3("Type3", {&Type1});
 const Rtti<RttiTestClass4> Type4("Type4", {&Type3, &Type2});
-const Rtti<RttiTestClass5> Type5("Type5", {}, {&Type6, &Type7});
-const Rtti<RttiTestClass6> Type6("Type6", {}, {&Type1});
-const Rtti<RttiTestClass7> Type7("Type7", {&Type6}, {});
+const Rtti<RttiTestClass5> Type5("Type5",
+                                 std::unordered_set<const RttiBase *>{},
+                                 {&Type6, &Type7});
+const Rtti<RttiTestClass6> Type6("Type6",
+                                 std::unordered_set<const RttiBase *>{},
+                                 {&Type1});
+const Rtti<RttiTestClass7> Type7("Type7", {&Type6},
+                                 std::unordered_set<const RttiBase *>{});
 
 TEST(Rtti, isa)
 {
-- 
cgit v1.2.3