summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Ganea <alexandre.ganea@ubisoft.com>2019-01-05 01:08:10 +0000
committerAlexandre Ganea <alexandre.ganea@ubisoft.com>2019-01-05 01:08:10 +0000
commite6ed8540c5896c54f1ec1f9130af922e15362b93 (patch)
tree34d89f6e25890f6bbcb25c634b232ad312408d71
parent045a83231db16d414f313cf7f71166adbb386e49 (diff)
downloadbcm5719-llvm-e6ed8540c5896c54f1ec1f9130af922e15362b93.tar.gz
bcm5719-llvm-e6ed8540c5896c54f1ec1f9130af922e15362b93.zip
[LLD][COFF] Fix namespace compilation issue with a upcoming patch. NFC
llvm-svn: 350450
-rw-r--r--lld/COFF/PDB.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp
index ad4f39b31e3..ae2defdca6f 100644
--- a/lld/COFF/PDB.cpp
+++ b/lld/COFF/PDB.cpp
@@ -213,7 +213,7 @@ private:
std::vector<pdb::SecMapEntry> SectionMap;
/// Type index mappings of type server PDBs that we've loaded so far.
- std::map<GUID, CVIndexMap> TypeServerIndexMappings;
+ std::map<codeview::GUID, CVIndexMap> TypeServerIndexMappings;
/// Type index mappings of precompiled objects type map that we've loaded so
/// far.
@@ -221,7 +221,7 @@ private:
/// List of TypeServer PDBs which cannot be loaded.
/// Cached to prevent repeated load attempts.
- std::map<GUID, std::string> MissingTypeServerPDBs;
+ std::map<codeview::GUID, std::string> MissingTypeServerPDBs;
};
class DebugSHandler {
@@ -507,7 +507,7 @@ PDBLinker::mergeDebugT(ObjFile *File, CVIndexMap *ObjectIndexMap) {
}
static Expected<std::unique_ptr<pdb::NativeSession>>
-tryToLoadPDB(const GUID &GuidFromObj, StringRef TSPath) {
+tryToLoadPDB(const codeview::GUID &GuidFromObj, StringRef TSPath) {
// Ensure the file exists before anything else. We want to return ENOENT,
// "file not found", even if the path points to a removable device (in which
// case the return message would be EAGAIN, "resource unavailable try again")
@@ -550,7 +550,7 @@ PDBLinker::maybeMergeTypeServerPDB(ObjFile *File, const CVType &FirstType) {
TypeDeserializer::deserializeAs(const_cast<CVType &>(FirstType), TS))
fatal("error reading record: " + toString(std::move(EC)));
- const GUID &TSId = TS.getGuid();
+ const codeview::GUID &TSId = TS.getGuid();
StringRef TSPath = TS.getName();
// First, check if the PDB has previously failed to load.
OpenPOWER on IntegriCloud