diff --git a/src/Context.cpp b/src/Context.cpp index 7c7a76225..0a9f5e6b9 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -337,7 +337,11 @@ Context::Context() { std::unordered_map futureExtensions; for(std::size_t i = future; i != versions.size(); ++i) for(const Extension& extension: Extension::extensions(versions[i])) + #ifndef CORRADE_GCC46_COMPATIBILITY futureExtensions.emplace(extension._string, extension); + #else + futureExtensions.insert({extension._string, extension}); + #endif /* Check for presence of extensions in future versions */ #ifndef MAGNUM_TARGET_GLES2 diff --git a/src/MeshTools/RemoveDuplicates.h b/src/MeshTools/RemoveDuplicates.h index d51c7e61c..55d72e7ea 100644 --- a/src/MeshTools/RemoveDuplicates.h +++ b/src/MeshTools/RemoveDuplicates.h @@ -127,7 +127,11 @@ template void RemoveDuplicates::from(index), v); + #else + auto result = table.insert({Math::Vector::from(index), v}); + #endif *it = result.first->second.newIndex; } diff --git a/src/ResourceManager.h b/src/ResourceManager.h index 261566ff5..0831ac727 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -469,7 +469,11 @@ template void ResourceManagerData::set(const ResourceKey key, T* con /* Insert it, if not already here */ } else if(it == _data.end()) + #ifndef CORRADE_GCC46_COMPATIBILITY it = _data.emplace(key, Data()).first; + #else + it = _data.insert({key, Data()}).first; + #endif /* Replace previous data */ delete it->second.data;