struct Merge7zFormatRegister
{
- Merge7zFormatRegister(Merge7z::Format *(*pfnGuessFormat)(const String& path))
+ explicit Merge7zFormatRegister(Merge7z::Format *(*pfnGuessFormat)(const String& path))
{
Add(pfnGuessFormat);
}
for (size_t i = 0; i < Merge7zFormatRegister::optionalFormats.size(); ++i)
{
Merge7z::Format* pFormat = Merge7zFormatRegister::optionalFormats[i](path);
- if (pFormat)
+ if (pFormat != nullptr)
return pFormat;
}
- return NULL;
+ return nullptr;
}
static std::vector<Merge7z::Format *(*)(const String& path)> optionalFormats;