Code style fixes.

This commit is contained in:
Jean-Philip Desjardins 2019-02-11 18:45:16 -05:00
parent 624cd1b572
commit 5ae930b45d
2 changed files with 6 additions and 10 deletions

View File

@ -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();

View File

@ -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<uint32, FileInfo> FileMapType;
typedef std::map<uint32, Ioman::Directory> DirectoryMapType;
typedef std::map<std::string, DevicePtr> DeviceMapType;