File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -428,7 +428,7 @@ class FileStream : public simplecpp::TokenList::Stream {
428428 lastStatus = lastCh = fgetc (file);
429429 return lastCh;
430430 }
431- virtual int peek () override {
431+ virtual int peek () override {
432432 // keep lastCh intact
433433 const int ch = fgetc (file);
434434 unget_internal (ch);
Original file line number Diff line number Diff line change @@ -470,33 +470,30 @@ namespace simplecpp {
470470 } FileId;
471471 } fileIdInfo;
472472
473- bool operator ==(const FileID &that) const noexcept
474- {
473+ bool operator ==(const FileID &that) const noexcept {
475474 return fileIdInfo.VolumeSerialNumber == that.fileIdInfo .VolumeSerialNumber &&
476- fileIdInfo.FileId .IdentifierHi == that.fileIdInfo .FileId .IdentifierHi &&
477- fileIdInfo.FileId .IdentifierLo == that.fileIdInfo .FileId .IdentifierLo ;
475+ fileIdInfo.FileId .IdentifierHi == that.fileIdInfo .FileId .IdentifierHi &&
476+ fileIdInfo.FileId .IdentifierLo == that.fileIdInfo .FileId .IdentifierLo ;
478477 }
479478#else
480479 dev_t dev;
481480 ino_t ino;
482481
483- bool operator ==(const FileID& that) const noexcept
484- {
482+ bool operator ==(const FileID& that) const noexcept {
485483 return dev == that.dev && ino == that.ino ;
486484 }
487485#endif
488486 struct Hasher {
489- std::size_t operator ()(const FileID &id) const
490- {
487+ std::size_t operator ()(const FileID &id) const {
491488#ifdef SIMPLECPP_WINDOWS
492489 return static_cast <std::size_t >(id.fileIdInfo .FileId .IdentifierHi ^ id.fileIdInfo .FileId .IdentifierLo ^
493- id.fileIdInfo .VolumeSerialNumber );
490+ id.fileIdInfo .VolumeSerialNumber );
494491#else
495492 return static_cast <std::size_t >(id.dev << 32 ) | static_cast <std::size_t >(id.ino );
496493#endif
497494 }
498495 };
499- };
496+ };
500497
501498 using name_map_type = std::unordered_map<std::string, FileData *>;
502499 using id_map_type = std::unordered_map<FileID, FileData *, FileID::Hasher>;
You can’t perform that action at this time.
0 commit comments