summaryrefslogtreecommitdiff
path: root/src/core/managed/ManagedContainer.hpp
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-15 02:16:21 +0100
committerAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-15 02:16:21 +0100
commit1889a5ca33ac1253ce1b220f667bf0ea94515a1b (patch)
tree16e8e517c0c84c2fa89d61f77273aa13327c5a7b /src/core/managed/ManagedContainer.hpp
parente99a307bf76689e4e86f8ac1a4c545bcebbdb7ab (diff)
fixed clang warnings and errors
Diffstat (limited to 'src/core/managed/ManagedContainer.hpp')
-rw-r--r--src/core/managed/ManagedContainer.hpp15
1 files changed, 6 insertions, 9 deletions
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;
};
}