From b02cab2f32a7981fa96bfffbcf9154ceb2dae059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 11 Jun 2025 13:56:02 +0200 Subject: [PATCH] Don't use the deprecated DefaultInit Array constructors. --- src/Magnum/MaterialTools/Copy.cpp | 4 ++-- src/Magnum/MeshTools/Copy.cpp | 4 ++-- src/Magnum/SceneTools/Copy.cpp | 4 ++-- src/Magnum/Trade/PhongMaterialData.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Magnum/MaterialTools/Copy.cpp b/src/Magnum/MaterialTools/Copy.cpp index 3920d579b..ddccbaa7a 100644 --- a/src/Magnum/MaterialTools/Copy.cpp +++ b/src/Magnum/MaterialTools/Copy.cpp @@ -46,9 +46,9 @@ Trade::MaterialData copy(Trade::MaterialData&& material) { if(material.attributeDataFlags() >= (Trade::DataFlag::Mutable|Trade::DataFlag::Owned)) attributes = material.releaseAttributeData(); else { - /* DefaultInit so we don't use a non-default deleter which could cause + /* ValueInit so we don't use a non-default deleter which could cause problems in plugins */ - attributes = Containers::Array{DefaultInit, material.attributeData().size()}; + attributes = Containers::Array{ValueInit, material.attributeData().size()}; Utility::copy(material.attributeData(), attributes); } diff --git a/src/Magnum/MeshTools/Copy.cpp b/src/Magnum/MeshTools/Copy.cpp index 3d007f4a0..6755a331a 100644 --- a/src/Magnum/MeshTools/Copy.cpp +++ b/src/Magnum/MeshTools/Copy.cpp @@ -141,9 +141,9 @@ Trade::MeshData copy(Trade::MeshData&& mesh) { a default deleter, but would need to pay attention to not copy items to themselves and such */ } else { - /* Using DefaultInit so the array has a default deleter and isn't + /* Using ValueInit so the array has a default deleter and isn't problematic to use in plugins */ - attributeData = Containers::Array{DefaultInit, originalAttributeData.size()}; + attributeData = Containers::Array{ValueInit, originalAttributeData.size()}; for(std::size_t i = 0; i != originalAttributeData.size(); ++i) { const Trade::MeshAttributeData& originalAttribute = originalAttributeData[i]; diff --git a/src/Magnum/SceneTools/Copy.cpp b/src/Magnum/SceneTools/Copy.cpp index e8881c56a..2860ada06 100644 --- a/src/Magnum/SceneTools/Copy.cpp +++ b/src/Magnum/SceneTools/Copy.cpp @@ -83,9 +83,9 @@ Trade::SceneData copy(Trade::SceneData&& scene) { a default deleter, but would need to pay attention to not copy items to themselves and such */ } else { - /* Using DefaultInit so the array has a default deleter and isn't + /* Using ValueInit so the array has a default deleter and isn't problematic to use in plugins */ - fieldData = Containers::Array{DefaultInit, originalFieldData.size()}; + fieldData = Containers::Array{ValueInit, originalFieldData.size()}; for(std::size_t i = 0; i != originalFieldData.size(); ++i) { const Trade::SceneFieldData& originalField = originalFieldData[i]; diff --git a/src/Magnum/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp index 997a9cbd0..24b2706e0 100644 --- a/src/Magnum/Trade/PhongMaterialData.cpp +++ b/src/Magnum/Trade/PhongMaterialData.cpp @@ -94,7 +94,7 @@ PhongMaterialData::PhongMaterialData(const Flags flags, const Color4& ambientCol /* Convert back to a non-growable Array as importers don't allow custom deleters in plugin implementations */ - arrayShrink(data, DefaultInit); + arrayShrink(data, ValueInit); return data; }(), importerState} { /* The data can't be filled here because it won't be sorted correctly */