@@ -3093,40 +3093,42 @@ static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const
30933093 return " " ;
30943094}
30953095
3096- struct FileID {
3096+ namespace {
3097+ struct FileID {
30973098#ifdef _WIN32
3098- struct {
3099- std::uint64_t VolumeSerialNumber;
31003099 struct {
3101- std::uint64_t IdentifierHi;
3102- std::uint64_t IdentifierLo;
3103- } FileId;
3104- } fileIdInfo;
3105-
3106- bool operator ==(const FileID &that) const noexcept {
3107- return fileIdInfo.VolumeSerialNumber == that.fileIdInfo .VolumeSerialNumber &&
3108- fileIdInfo.FileId .IdentifierHi == that.fileIdInfo .FileId .IdentifierHi &&
3109- fileIdInfo.FileId .IdentifierLo == that.fileIdInfo .FileId .IdentifierLo ;
3110- }
3100+ std::uint64_t VolumeSerialNumber;
3101+ struct {
3102+ std::uint64_t IdentifierHi;
3103+ std::uint64_t IdentifierLo;
3104+ } FileId;
3105+ } fileIdInfo;
3106+
3107+ bool operator ==(const FileID &that) const noexcept {
3108+ return fileIdInfo.VolumeSerialNumber == that.fileIdInfo .VolumeSerialNumber &&
3109+ fileIdInfo.FileId .IdentifierHi == that.fileIdInfo .FileId .IdentifierHi &&
3110+ fileIdInfo.FileId .IdentifierLo == that.fileIdInfo .FileId .IdentifierLo ;
3111+ }
31113112#else
3112- dev_t dev;
3113- ino_t ino;
3113+ dev_t dev;
3114+ ino_t ino;
31143115
3115- bool operator ==(const FileID& that) const noexcept {
3116- return dev == that.dev && ino == that.ino ;
3117- }
3116+ bool operator ==(const FileID& that) const noexcept {
3117+ return dev == that.dev && ino == that.ino ;
3118+ }
31183119#endif
3119- struct Hasher {
3120- std::size_t operator ()(const FileID &id) const {
3120+ struct Hasher {
3121+ std::size_t operator ()(const FileID &id) const {
31213122#ifdef _WIN32
3122- return static_cast <std::size_t >(id.fileIdInfo .FileId .IdentifierHi ^ id.fileIdInfo .FileId .IdentifierLo ^
3123- id.fileIdInfo .VolumeSerialNumber );
3123+ return static_cast <std::size_t >(id.fileIdInfo .FileId .IdentifierHi ^ id.fileIdInfo .FileId .IdentifierLo ^
3124+ id.fileIdInfo .VolumeSerialNumber );
31243125#else
3125- return static_cast <std::size_t >(id.dev ) ^ static_cast <std::size_t >(id.ino );
3126+ return static_cast <std::size_t >(id.dev ) ^ static_cast <std::size_t >(id.ino );
31263127#endif
3127- }
3128+ }
3129+ };
31283130 };
3129- };
3131+ }
31303132
31313133struct simplecpp ::FileDataCache::Impl
31323134{
0 commit comments