From 5ae930b45df34c1c14409fe2ab60724cb61d4ae4 Mon Sep 17 00:00:00 2001 From: Jean-Philip Desjardins Date: Mon, 11 Feb 2019 18:45:16 -0500 Subject: [PATCH] Code style fixes. --- Source/iop/Iop_Ioman.cpp | 8 +++----- Source/iop/Iop_Ioman.h | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/iop/Iop_Ioman.cpp b/Source/iop/Iop_Ioman.cpp index 0e1dcf27..5c82c73d 100644 --- a/Source/iop/Iop_Ioman.cpp +++ b/Source/iop/Iop_Ioman.cpp @@ -494,11 +494,9 @@ void CIoman::SaveState(Framework::CZipArchiveWriter& archive) void CIoman::LoadState(Framework::CZipArchiveReader& archive) { std::experimental::erase_if(m_files, - [] (const FileMapType::value_type& filePair) - { - return (filePair.first != FID_STDOUT) && (filePair.first != FID_STDERR); - } - ); + [](const FileMapType::value_type& filePair) { + return (filePair.first != FID_STDOUT) && (filePair.first != FID_STDERR); + }); auto fileStateFile = CXmlStateFile(*archive.BeginReadFile(STATE_FILES_FILENAME)); auto fileStateNode = fileStateFile.GetRoot(); diff --git a/Source/iop/Iop_Ioman.h b/Source/iop/Iop_Ioman.h index 4529187d..00db95b1 100644 --- a/Source/iop/Iop_Ioman.h +++ b/Source/iop/Iop_Ioman.h @@ -103,9 +103,8 @@ namespace Iop FileInfo() = default; FileInfo(Framework::CStream* stream) - : stream(stream) + : stream(stream) { - } FileInfo(FileInfo&& rhs) @@ -118,7 +117,7 @@ namespace Iop Reset(); } - FileInfo& operator =(FileInfo&& rhs) + FileInfo& operator=(FileInfo&& rhs) { MoveFrom(std::move(rhs)); return (*this); @@ -140,7 +139,7 @@ namespace Iop path.clear(); } - FileInfo& operator =(const FileInfo&) = delete; + FileInfo& operator=(const FileInfo&) = delete; FileInfo(const FileInfo&) = delete; Framework::CStream* stream = nullptr; @@ -148,7 +147,6 @@ namespace Iop uint32 flags = 0; }; - typedef std::map FileMapType; typedef std::map DirectoryMapType; typedef std::map DeviceMapType;