Remove useless 'llvm::' qualifier from names like StringRef and others that are
brought into 'clang' namespace by clang/Basic/LLVM.h
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172323 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 83be79e..8ca0a82 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -1321,7 +1321,7 @@
I != E; ++I) {
const UnwrappedLine &TheLine = *I;
if (touchesRanges(TheLine)) {
- llvm::OwningPtr<TokenAnnotator> AnnotatedLine(
+ OwningPtr<TokenAnnotator> AnnotatedLine(
new TokenAnnotator(TheLine, Style, SourceMgr, Lex));
if (!AnnotatedLine->annotate())
break;
@@ -1359,7 +1359,7 @@
///
/// Returns whether the resulting \c Line can fit in a single line.
bool tryFitMultipleLinesInOne(unsigned Indent, UnwrappedLine &Line,
- llvm::OwningPtr<TokenAnnotator> &AnnotatedLine,
+ OwningPtr<TokenAnnotator> &AnnotatedLine,
std::vector<UnwrappedLine>::iterator &I,
std::vector<UnwrappedLine>::iterator E) {
unsigned Limit = Style.ColumnLimit - (I->InPPDirective ? 1 : 0) - Indent;
@@ -1410,7 +1410,7 @@
return FitsOnALine;
Last->Children.push_back(*Next);
- llvm::OwningPtr<TokenAnnotator> CombinedAnnotator(
+ OwningPtr<TokenAnnotator> CombinedAnnotator(
new TokenAnnotator(Combined, Style, SourceMgr, Lex));
if (CombinedAnnotator->annotate() &&
fitsIntoLimit(CombinedAnnotator->getRootToken(), Limit)) {
@@ -1506,7 +1506,7 @@
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), &*DiagOpts);
DiagnosticPrinter.BeginSourceFile(Lex.getLangOpts(), Lex.getPP());
DiagnosticsEngine Diagnostics(
- llvm::IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
+ IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
&DiagnosticPrinter, false);
Diagnostics.setSourceManager(&SourceMgr);
Formatter formatter(Diagnostics, Style, Lex, SourceMgr, Ranges);
diff --git a/lib/Format/UnwrappedLineParser.h b/lib/Format/UnwrappedLineParser.h
index cfd0608..487e701 100644
--- a/lib/Format/UnwrappedLineParser.h
+++ b/lib/Format/UnwrappedLineParser.h
@@ -159,7 +159,7 @@
// FIXME: We are constantly running into bugs where Line.Level is incorrectly
// subtracted from beyond 0. Introduce a method to subtract from Line.Level
// and use that everywhere in the Parser.
- llvm::OwningPtr<UnwrappedLine> Line;
+ OwningPtr<UnwrappedLine> Line;
bool RootTokenInitialized;
FormatToken *LastInCurrentLine;
FormatToken FormatTok;