From 1889a5ca33ac1253ce1b220f667bf0ea94515a1b Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Thu, 15 Jan 2015 02:16:21 +0100
Subject: fixed clang warnings and errors

---
 src/core/managed/Events.hpp           |  3 ++-
 src/core/managed/ManagedContainer.hpp | 15 ++++++---------
 src/core/managed/Manager.cpp          |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/core/managed')

diff --git a/src/core/managed/Events.hpp b/src/core/managed/Events.hpp
index a69c363..e433c6d 100644
--- a/src/core/managed/Events.hpp
+++ b/src/core/managed/Events.hpp
@@ -84,7 +84,8 @@ using EventHandler = void (*)(const Event &event, Managed *owner, void *data);
  * The Event class and its child classes are responsible for containing the
  * actual event data which further describes the event to the event handlers.
  */
-struct Event {
+class Event {
+public:
 	/**
 	 * Actual event type.
 	 */
diff --git a/src/core/managed/ManagedContainer.hpp b/src/core/managed/ManagedContainer.hpp
index 6952964..13038f9 100644
--- a/src/core/managed/ManagedContainer.hpp
+++ b/src/core/managed/ManagedContainer.hpp
@@ -552,8 +552,7 @@ public:
 	/* Insert and delete operations */
 
 	template <class InputIterator>
-	iterator insert(iterator position, InputIterator first,
-	                InputIterator last)
+	iterator insert(iterator position, InputIterator first, InputIterator last)
 	{
 		bool atStart = true;
 		iterator pos = position;
@@ -680,9 +679,8 @@ class ManagedVector
     : public ManagedGenericList<T, std::vector<Handle<T>>,
                                 ListAccessor<Handle<T>>, Listener> {
 public:
-	using Base = ManagedGenericList<T, std::vector<Handle<T>>,
-	                                ListAccessor<Handle<T>>, Listener>;
-	using Base::ManagedGenericList;
+	using ManagedGenericList<T, std::vector<Handle<T>>, ListAccessor<Handle<T>>,
+	                         Listener>::ManagedGenericList;
 };
 
 /**
@@ -694,10 +692,9 @@ class ManagedMap
     : public ManagedGenericMap<K, T, std::map<K, Handle<T>>,
                                MapAccessor<std::pair<K, Handle<T>>>, Listener> {
 public:
-	using Base =
-	    ManagedGenericMap<K, T, std::map<K, Handle<T>>,
-	                      MapAccessor<std::pair<K, Handle<T>>>, Listener>;
-	using Base::ManagedGenericMap;
+	using ManagedGenericMap<K, T, std::map<K, Handle<T>>,
+	                        MapAccessor<std::pair<K, Handle<T>>>,
+	                        Listener>::ManagedGenericMap;
 };
 }
 
diff --git a/src/core/managed/Manager.cpp b/src/core/managed/Manager.cpp
index 60f7332..c6d7f93 100644
--- a/src/core/managed/Manager.cpp
+++ b/src/core/managed/Manager.cpp
@@ -318,7 +318,7 @@ void Manager::sweep()
 
 			// Perform a breadth-first search starting from the current Managed
 			bool isReachable = false;
-			std::unordered_set<Managed *> visited{{curManaged}};
+			std::unordered_set<Managed *> visited{curManaged};
 			std::queue<Managed *> queue{{curManaged}};
 			while (!queue.empty() && !isReachable) {
 				// Pop the next element from the queue, remove the element from
-- 
cgit v1.2.3