From 1889a5ca33ac1253ce1b220f667bf0ea94515a1b Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Thu, 15 Jan 2015 02:16:21 +0100 Subject: fixed clang warnings and errors --- src/core/managed/ManagedContainer.hpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/core/managed/ManagedContainer.hpp') 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 - 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>, ListAccessor>, Listener> { public: - using Base = ManagedGenericList>, - ListAccessor>, Listener>; - using Base::ManagedGenericList; + using ManagedGenericList>, ListAccessor>, + Listener>::ManagedGenericList; }; /** @@ -694,10 +692,9 @@ class ManagedMap : public ManagedGenericMap>, MapAccessor>>, Listener> { public: - using Base = - ManagedGenericMap>, - MapAccessor>>, Listener>; - using Base::ManagedGenericMap; + using ManagedGenericMap>, + MapAccessor>>, + Listener>::ManagedGenericMap; }; } -- cgit v1.2.3