diff --git a/src/Magnum/DebugTools/FrameProfiler.cpp b/src/Magnum/DebugTools/FrameProfiler.cpp index 298809c57..177a23aa3 100644 --- a/src/Magnum/DebugTools/FrameProfiler.cpp +++ b/src/Magnum/DebugTools/FrameProfiler.cpp @@ -139,7 +139,7 @@ void FrameProfiler::enable() { _beginFrameCalled = false; #endif _measuredFrameCount = 0; - arrayResize(_data, 0); + arrayClear(_data); /* Wipe out no longer relevant moving sums from all measurements, and delayed measurement indices as well (tho for these it's not so diff --git a/src/Magnum/GL/Context.cpp b/src/Magnum/GL/Context.cpp index 9ac9a9a11..6a8140e1b 100644 --- a/src/Magnum/GL/Context.cpp +++ b/src/Magnum/GL/Context.cpp @@ -1296,9 +1296,8 @@ Context::Configuration::~Configuration() = default; Context::Configuration& Context::Configuration::operator=(const Configuration& other) { _flags = other._flags; - arrayResize(_disabledWorkarounds, 0); - /** @todo arrayClear(), ffs */ - arrayResize(_disabledExtensions, NoInit, 0); + arrayClear(_disabledWorkarounds); + arrayClear(_disabledExtensions); addDisabledWorkarounds(other._disabledWorkarounds); addDisabledExtensions(other._disabledExtensions); return *this; diff --git a/src/Magnum/MeshTools/Test/ConcatenateTest.cpp b/src/Magnum/MeshTools/Test/ConcatenateTest.cpp index 3f3ca4521..acf2a3afc 100644 --- a/src/Magnum/MeshTools/Test/ConcatenateTest.cpp +++ b/src/Magnum/MeshTools/Test/ConcatenateTest.cpp @@ -471,9 +471,9 @@ void ConcatenateTest::concatenateInto() { Containers::Array vertexData; Containers::Array indexData; arrayResize(vertexData, DirectInit, (sizeof(Vector2) + sizeof(Vector3))*7, '\xff'); - arrayResize(vertexData, 0); + arrayClear(vertexData); arrayResize(indexData, DirectInit, sizeof(UnsignedInt)*9, '\xff'); - arrayResize(indexData, 0); + arrayClear(indexData); const void* attributeDataPointer = attributeData; const void* vertexDataPointer = vertexData; const void* indexDataPointer = indexData; diff --git a/src/Magnum/MeshTools/Tipsify.cpp b/src/Magnum/MeshTools/Tipsify.cpp index eeeae8cc4..cab08ee3f 100644 --- a/src/Magnum/MeshTools/Tipsify.cpp +++ b/src/Magnum/MeshTools/Tipsify.cpp @@ -62,7 +62,7 @@ template void tipsifyInPlaceImplementation(const Containers::StridedArr UnsignedInt i = 0; while(fanningVertex != 0xFFFFFFFFu) { /* Reset the candidates for this vertex */ - arrayResize(candidates, 0); + arrayClear(candidates); /* For all neighbors of fanning vertex */ for(UnsignedInt ti = neighborOffset[fanningVertex]; ti != neighborOffset[fanningVertex+1]; ++ti) { diff --git a/src/Magnum/Trade/AbstractSceneConverter.cpp b/src/Magnum/Trade/AbstractSceneConverter.cpp index be8ee5101..549cf34d0 100644 --- a/src/Magnum/Trade/AbstractSceneConverter.cpp +++ b/src/Magnum/Trade/AbstractSceneConverter.cpp @@ -1328,7 +1328,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor } arrayReserve(levels, levelCount); - arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ + arrayClear(levels); for(UnsignedInt j = 0; j != levelCount; ++j) { if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing mesh" << i << "level" << j << "out of" << levelCount; @@ -1384,7 +1384,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor } arrayReserve(levels, levelCount); - arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ + arrayClear(levels); for(UnsignedInt j = 0; j != levelCount; ++j) { if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 1D image" << i << "level" << j << "out of" << levelCount; @@ -1437,7 +1437,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor } arrayReserve(levels, levelCount); - arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ + arrayClear(levels); for(UnsignedInt j = 0; j != levelCount; ++j) { if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 2D image" << i << "level" << j << "out of" << levelCount; @@ -1490,7 +1490,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor } arrayReserve(levels, levelCount); - arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ + arrayClear(levels); for(UnsignedInt j = 0; j != levelCount; ++j) { if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 3D image" << i << "level" << j << "out of" << levelCount; diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp index 1ab71c37d..2bb4429dd 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp @@ -206,7 +206,7 @@ Containers::Pointer MagnumFont::doCreateShaper() { const Containers::StringView text = textFull.slice(begin, end == ~UnsignedInt{} ? textFull.size() : end); /* Get glyph codes from characters */ - arrayResize(_glyphs, 0); + arrayClear(_glyphs); arrayReserve(_glyphs, text.size()); for(std::size_t i = 0; i != text.size(); ) { const Containers::Pair codepointNext = Utility::Unicode::nextChar(text, i);