Refactored inode and device number into FileEntry, and changed the
ADT storing FileEntry's in FileManager from a map to a set.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45184 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Basic/FileManager.cpp b/Basic/FileManager.cpp
index 9edbd03..2467fa6 100644
--- a/Basic/FileManager.cpp
+++ b/Basic/FileManager.cpp
@@ -142,14 +142,12 @@
}
//std::cerr << ": exists\n";
- // It exists. See if we have already opened a directory with the same inode.
+ // It exists. See if we have already opened a file with the same inode.
// This occurs when one dir is symlinked to another, for example.
- std::pair<FileEntryMap::iterator,bool> X =
- UniqueFiles.insert(FileEntryMap::value_type(std::make_pair(StatBuf.st_dev,
- StatBuf.st_ino),
- FileEntry()));
-
- FileEntry &UFE = X.first->second;
+ FileEntry &UFE =
+ const_cast<FileEntry&>(*UniqueFiles.insert(FileEntry(StatBuf.st_dev,
+ StatBuf.st_ino)).first);
+
NamedFileEnt.setValue(&UFE);
if (UFE.getName()) // Already have an entry with this inode, return it.
@@ -163,7 +161,6 @@
UFE.ModTime = StatBuf.st_mtime;
UFE.Dir = DirInfo;
UFE.UID = NextFileUID++;
- UFE.InoDev = &X.first->first;
return &UFE;
}