diff options
Diffstat (limited to 'lib/Basic')
| -rw-r--r-- | lib/Basic/Diagnostic.cpp | 2 | ||||
| -rw-r--r-- | lib/Basic/IdentifierTable.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp index f964423a22..d3bb9d5496 100644 --- a/lib/Basic/Diagnostic.cpp +++ b/lib/Basic/Diagnostic.cpp @@ -794,7 +794,7 @@ FormatDiagnostic(llvm::SmallVectorImpl<char> &OutStr) const { continue; } - llvm::raw_svector_ostream(OutStr) << '\'' << II->getNameStr() << '\''; + llvm::raw_svector_ostream(OutStr) << '\'' << II->getName() << '\''; break; } case Diagnostic::ak_qualtype: diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp index a3c5c4a408..16aa0c5484 100644 --- a/lib/Basic/IdentifierTable.cpp +++ b/lib/Basic/IdentifierTable.cpp @@ -306,7 +306,7 @@ std::string MultiKeywordSelector::getName() const { llvm::raw_svector_ostream OS(Str); for (keyword_iterator I = keyword_begin(), E = keyword_end(); I != E; ++I) { if (*I) - OS << (*I)->getNameStr(); + OS << (*I)->getName(); OS << ':'; } @@ -322,12 +322,12 @@ std::string Selector::getAsString() const { // If the number of arguments is 0 then II is guaranteed to not be null. if (getNumArgs() == 0) - return II->getNameStr(); + return II->getName(); if (!II) return ":"; - return II->getNameStr().str() + ":"; + return II->getName().str() + ":"; } // We have a multiple keyword selector (no embedded flags). |