@@ -3078,40 +3078,42 @@ static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const
30783078 return " " ;
30793079}
30803080
3081- struct FileID {
3081+ namespace {
3082+ struct FileID {
30823083#ifdef _WIN32
3083- struct {
3084- std::uint64_t VolumeSerialNumber;
30853084 struct {
3086- std::uint64_t IdentifierHi;
3087- std::uint64_t IdentifierLo;
3088- } FileId;
3089- } fileIdInfo;
3090-
3091- bool operator ==(const FileID &that) const noexcept {
3092- return fileIdInfo.VolumeSerialNumber == that.fileIdInfo .VolumeSerialNumber &&
3093- fileIdInfo.FileId .IdentifierHi == that.fileIdInfo .FileId .IdentifierHi &&
3094- fileIdInfo.FileId .IdentifierLo == that.fileIdInfo .FileId .IdentifierLo ;
3095- }
3085+ std::uint64_t VolumeSerialNumber;
3086+ struct {
3087+ std::uint64_t IdentifierHi;
3088+ std::uint64_t IdentifierLo;
3089+ } FileId;
3090+ } fileIdInfo;
3091+
3092+ bool operator ==(const FileID &that) const noexcept {
3093+ return fileIdInfo.VolumeSerialNumber == that.fileIdInfo .VolumeSerialNumber &&
3094+ fileIdInfo.FileId .IdentifierHi == that.fileIdInfo .FileId .IdentifierHi &&
3095+ fileIdInfo.FileId .IdentifierLo == that.fileIdInfo .FileId .IdentifierLo ;
3096+ }
30963097#else
3097- dev_t dev;
3098- ino_t ino;
3098+ dev_t dev;
3099+ ino_t ino;
30993100
3100- bool operator ==(const FileID& that) const noexcept {
3101- return dev == that.dev && ino == that.ino ;
3102- }
3101+ bool operator ==(const FileID& that) const noexcept {
3102+ return dev == that.dev && ino == that.ino ;
3103+ }
31033104#endif
3104- struct Hasher {
3105- std::size_t operator ()(const FileID &id) const {
3105+ struct Hasher {
3106+ std::size_t operator ()(const FileID &id) const {
31063107#ifdef _WIN32
3107- return static_cast <std::size_t >(id.fileIdInfo .FileId .IdentifierHi ^ id.fileIdInfo .FileId .IdentifierLo ^
3108- id.fileIdInfo .VolumeSerialNumber );
3108+ return static_cast <std::size_t >(id.fileIdInfo .FileId .IdentifierHi ^ id.fileIdInfo .FileId .IdentifierLo ^
3109+ id.fileIdInfo .VolumeSerialNumber );
31093110#else
3110- return static_cast <std::size_t >(id.dev ) ^ static_cast <std::size_t >(id.ino );
3111+ return static_cast <std::size_t >(id.dev ) ^ static_cast <std::size_t >(id.ino );
31113112#endif
3112- }
3113+ }
3114+ };
31133115 };
3114- };
3116+ }
31153117
31163118struct simplecpp ::FileDataCache::Impl
31173119{
0 commit comments