diff --git a/src/Magnum/Implementation/State.cpp b/src/Magnum/Implementation/State.cpp index 82354e734..133eddccc 100644 --- a/src/Magnum/Implementation/State.cpp +++ b/src/Magnum/Implementation/State.cpp @@ -65,7 +65,8 @@ State::State(Context& context) { extensions.erase(std::unique(extensions.begin(), extensions.end()), extensions.end()); Debug() << "Using optional features:"; - for(const auto& ext: extensions) Debug() << " " << ext; + for(auto it = extensions.begin(); it != extensions.end(); ++it) + Debug() << " " << *it; } State::~State() { diff --git a/src/Magnum/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h index 4107420cd..27e16f4d3 100644 --- a/src/Magnum/MeshTools/RemoveDuplicates.h +++ b/src/Magnum/MeshTools/RemoveDuplicates.h @@ -101,9 +101,9 @@ std::vector indices = MeshTools::combineIndexedArrays( template std::vector removeDuplicates(std::vector& data, typename Vector::Type epsilon = Math::TypeTraits::epsilon()) { /* Get bounds */ Vector min = data[0], max = data[0]; - for(const auto& v: data) { - min = Math::min(v, min); - max = Math::max(v, max); + for(auto it = data.begin(); it != data.end(); ++it) { + min = Math::min(*it, min); + max = Math::max(*it, max); } /* Make epsilon so large that std::size_t can index all vectors inside the @@ -150,7 +150,8 @@ template std::vector removeDuplicates(std::vector void AbstractObject::setClean(const std::vector*>& objects) { std::vector>> references; references.reserve(objects.size()); - for(auto o: objects) { - CORRADE_INTERNAL_ASSERT(o != nullptr); - references.push_back(*o); + for(auto it = objects.begin(); it != objects.end(); ++it) { + CORRADE_INTERNAL_ASSERT(*it != nullptr); + references.push_back(**it); } setClean(references); @@ -64,9 +64,9 @@ template AbstractObject::~Abstra template auto AbstractObject::transformationMatrices(const std::vector*>& objects, const MatrixType& initialTransformationMatrix) const -> std::vector { std::vector>> references; references.reserve(objects.size()); - for(auto o: objects) { - CORRADE_INTERNAL_ASSERT(o != nullptr); - references.push_back(*o); + for(auto it = objects.begin(); it != objects.end(); ++it) { + CORRADE_INTERNAL_ASSERT(*it != nullptr); + references.push_back(**it); } return transformationMatrices(references, initialTransformationMatrix); @@ -207,7 +207,8 @@ template auto Object::doTransformationMatr std::vector>> castObjects; castObjects.reserve(objects.size()); /** @todo Ensure this doesn't crash, somehow */ - for(auto o: objects) castObjects.push_back(static_cast&>(o.get())); + for(auto it = objects.begin(); it != objects.end(); ++it) + castObjects.push_back(static_cast&>(it->get())); return transformationMatrices(std::move(castObjects), initialTransformationMatrix); } @@ -225,9 +226,9 @@ template auto Object::transformationMatric template auto Object::transformationMatrices(const std::vector*>& objects, const MatrixType& initialTransformationMatrix) const -> std::vector { std::vector>> references; references.reserve(objects.size()); - for(auto o: objects) { - CORRADE_INTERNAL_ASSERT(o != nullptr); - references.push_back(*o); + for(auto it = objects.begin(); it != objects.end(); ++it) { + CORRADE_INTERNAL_ASSERT(*it != nullptr); + references.push_back(**it); } return transformationMatrices(references, initialTransformationMatrix); @@ -358,9 +359,9 @@ template std::vector Ob template std::vector Object::transformations(const std::vector*>& objects, const typename Transformation::DataType& initialTransformation) const { std::vector>> references; references.reserve(objects.size()); - for(auto o: objects) { - CORRADE_INTERNAL_ASSERT(o != nullptr); - references.push_back(*o); + for(auto it = objects.begin(); it != objects.end(); ++it) { + CORRADE_INTERNAL_ASSERT(*it != nullptr); + references.push_back(**it); } return transformations(std::move(references), initialTransformation); @@ -420,7 +421,8 @@ template void Object::doSetClean(const std std::vector>> castObjects; castObjects.reserve(objects.size()); /** @todo Ensure this doesn't crash, somehow */ - for(auto o: objects) castObjects.push_back(static_cast&>(o.get())); + for(auto it = objects.begin(); it != objects.end(); ++it) + castObjects.push_back(static_cast&>(it->get())); setClean(std::move(castObjects)); } @@ -475,9 +477,9 @@ template void Object::setClean(std::vector template void Object::setClean(const std::vector*>& objects) { std::vector>> references; references.reserve(objects.size()); - for(auto o: objects) { - CORRADE_INTERNAL_ASSERT(o != nullptr); - references.push_back(*o); + for(auto it = objects.begin(); it != objects.end(); ++it) { + CORRADE_INTERNAL_ASSERT(*it != nullptr); + references.push_back(**it); } setClean(std::move(references));