From 8566b9aa900e44caf2ea00dafe6e67d1d0946c4f Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Sat, 21 May 2016 22:46:02 +0300 Subject: [PATCH] D3MF: Use C++11 range-based for loop --- code/D3MFOpcPackage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/D3MFOpcPackage.cpp b/code/D3MFOpcPackage.cpp index acd7619e5..ae8dbccad 100644 --- a/code/D3MFOpcPackage.cpp +++ b/code/D3MFOpcPackage.cpp @@ -324,8 +324,8 @@ D3MFZipArchive::D3MFZipArchive(IOSystem* pIOHandler, const std::string& rFile) // ------------------------------------------------------------------------------------------------ // Destructor. D3MFZipArchive::~D3MFZipArchive() { - for( std::map::iterator it(m_ArchiveMap.begin()), end(m_ArchiveMap.end()); it != end; ++it ) { - delete it->second; + for(auto &file : m_ArchiveMap) { + delete file.second; } m_ArchiveMap.clear(); @@ -398,8 +398,8 @@ void D3MFZipArchive::Close(IOStream *pFile) { void D3MFZipArchive::getFileList(std::vector &rFileList) { rFileList.clear(); - for(std::map::iterator it(m_ArchiveMap.begin()), end(m_ArchiveMap.end()); it != end; ++it) { - rFileList.push_back(it->first); + for(const auto &file : m_ArchiveMap) { + rFileList.push_back(file.first); } }