From c9e5f0208d9d30a3f6c0a87028f7a5b3dd9de71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82uszak?= Date: Sun, 29 Jan 2023 20:38:41 +0100 Subject: [PATCH] Replace boost::scoped_array with std::vector --- components/esm4/loadaloc.cpp | 6 ++---- components/esm4/loadnpc.cpp | 5 ++--- components/esm4/loadpgrd.cpp | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp index 6039e0ead8..a8c6de2432 100644 --- a/components/esm4/loadaloc.cpp +++ b/components/esm4/loadaloc.cpp @@ -31,8 +31,6 @@ //#include // FIXME: for debugging only //#include // FIXME: for debugging only -//#include // FIXME - //#include "formid.hpp" // FIXME: #include "reader.hpp" @@ -131,8 +129,8 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader) case ESM4::SUB_FNAM: // always 0? 4 bytes { #if 0 - boost::scoped_array mDataBuf(new unsigned char[subHdr.dataSize]); - reader.get(mDataBuf.get(), subHdr.dataSize); + std::vector mDataBuf(subHdr.dataSize); + reader.get(mDataBuf.data(), subHdr.dataSize); std::ostringstream ss; ss << mEditorId << " " << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n"; diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp index eda5f8a4ca..2b8f953127 100644 --- a/components/esm4/loadnpc.cpp +++ b/components/esm4/loadnpc.cpp @@ -35,7 +35,6 @@ //#include //#include -#include #include "formid.hpp" // NOTE: for testing only #include "reader.hpp" @@ -261,8 +260,8 @@ void ESM4::Npc::load(ESM4::Reader& reader) case ESM4::SUB_DSTF: { #if 1 - boost::scoped_array dataBuf(new unsigned char[subHdr.dataSize]); - reader.get(dataBuf.get(), subHdr.dataSize); + std::vector dataBuf(subHdr.dataSize); + reader.get(dataBuf.data(), subHdr.dataSize); std::ostringstream ss; ss << mEditorId << " " << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n"; diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp index 93b14ed2c1..5f0ee69df3 100644 --- a/components/esm4/loadpgrd.cpp +++ b/components/esm4/loadpgrd.cpp @@ -30,8 +30,6 @@ //#include // FIXME: for debugging only //#include // FIXME: for debugging only -//#include // FIXME for debugging only - #include "formid.hpp" // FIXME: for mEditorId workaround #include "reader.hpp" //#include "writer.hpp" @@ -126,8 +124,8 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader) case ESM4::SUB_PGAG: { #if 0 - boost::scoped_array mDataBuf(new unsigned char[subHdr.dataSize]); - reader.get(mDataBuf.get(), subHdr.dataSize); + std::vector mDataBuf(subHdr.dataSize); + reader.get(mDataBuf.data(), subHdr.dataSize); std::ostringstream ss; ss << mEditorId << " " << ESM::printName(subHdr.typeId) << ":size " << subHdr.dataSize << "\n";