diff options
author | Chris Lattner <sabre@nondot.org> | 2011-07-23 10:55:15 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2011-07-23 10:55:15 +0000 |
commit | 5f9e272e632e951b1efe824cd16acb4d96077930 (patch) | |
tree | 3268557d12b85d0c2e72de5329ec83d4fc0bca48 /tools/arcmt-test | |
parent | d47d3b0cfeb7e8564ff77f48130fe63282b6d127 (diff) | |
download | clang-5f9e272e632e951b1efe824cd16acb4d96077930.tar.gz clang-5f9e272e632e951b1efe824cd16acb4d96077930.tar.bz2 clang-5f9e272e632e951b1efe824cd16acb4d96077930.tar.xz |
remove unneeded llvm:: namespace qualifiers on some core types now that LLVM.h imports
them into the clang namespace.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135852 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/arcmt-test')
-rw-r--r-- | tools/arcmt-test/arcmt-test.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tools/arcmt-test/arcmt-test.cpp b/tools/arcmt-test/arcmt-test.cpp index eb0f56943f..edef415edb 100644 --- a/tools/arcmt-test/arcmt-test.cpp +++ b/tools/arcmt-test/arcmt-test.cpp @@ -69,24 +69,24 @@ llvm::sys::Path GetExecutablePath(const char *Argv0) { } static void printSourceLocation(SourceLocation loc, ASTContext &Ctx, - llvm::raw_ostream &OS); + raw_ostream &OS); static void printSourceRange(CharSourceRange range, ASTContext &Ctx, - llvm::raw_ostream &OS); + raw_ostream &OS); namespace { class PrintTransforms : public MigrationProcess::RewriteListener { ASTContext *Ctx; - llvm::raw_ostream &OS; + raw_ostream &OS; public: - PrintTransforms(llvm::raw_ostream &OS) + PrintTransforms(raw_ostream &OS) : Ctx(0), OS(OS) { } virtual void start(ASTContext &ctx) { Ctx = &ctx; } virtual void finish() { Ctx = 0; } - virtual void insert(SourceLocation loc, llvm::StringRef text) { + virtual void insert(SourceLocation loc, StringRef text) { assert(Ctx); OS << "Insert: "; printSourceLocation(loc, *Ctx, OS); @@ -103,7 +103,7 @@ public: } // anonymous namespace -static bool checkForMigration(llvm::StringRef resourcesPath, +static bool checkForMigration(StringRef resourcesPath, llvm::ArrayRef<const char *> Args) { DiagnosticClient *DiagClient = new TextDiagnosticPrinter(llvm::errs(), DiagnosticOptions()); @@ -134,7 +134,7 @@ static bool checkForMigration(llvm::StringRef resourcesPath, return Diags->getClient()->getNumErrors() > 0; } -static void printResult(FileRemapper &remapper, llvm::raw_ostream &OS) { +static void printResult(FileRemapper &remapper, raw_ostream &OS) { CompilerInvocation CI; remapper.applyMappings(CI); PreprocessorOptions &PPOpts = CI.getPreprocessorOpts(); @@ -145,7 +145,7 @@ static void printResult(FileRemapper &remapper, llvm::raw_ostream &OS) { } } -static bool performTransformations(llvm::StringRef resourcesPath, +static bool performTransformations(StringRef resourcesPath, llvm::ArrayRef<const char *> Args) { // Check first. if (checkForMigration(resourcesPath, Args)) @@ -199,7 +199,7 @@ static bool performTransformations(llvm::StringRef resourcesPath, return false; } -static bool filesCompareEqual(llvm::StringRef fname1, llvm::StringRef fname2) { +static bool filesCompareEqual(StringRef fname1, StringRef fname2) { using namespace llvm; OwningPtr<MemoryBuffer> file1; @@ -303,7 +303,7 @@ static bool verifyTransformedFiles(llvm::ArrayRef<std::string> resultFiles) { //===----------------------------------------------------------------------===// static void printSourceLocation(SourceLocation loc, ASTContext &Ctx, - llvm::raw_ostream &OS) { + raw_ostream &OS) { SourceManager &SM = Ctx.getSourceManager(); PresumedLoc PL = SM.getPresumedLoc(loc); @@ -313,7 +313,7 @@ static void printSourceLocation(SourceLocation loc, ASTContext &Ctx, } static void printSourceRange(CharSourceRange range, ASTContext &Ctx, - llvm::raw_ostream &OS) { + raw_ostream &OS) { SourceManager &SM = Ctx.getSourceManager(); const LangOptions &langOpts = Ctx.getLangOptions(); @@ -338,7 +338,6 @@ static void printSourceRange(CharSourceRange range, ASTContext &Ctx, //===----------------------------------------------------------------------===// int main(int argc, const char **argv) { - using llvm::StringRef; void *MainAddr = (void*) (intptr_t) GetExecutablePath; llvm::sys::PrintStackTraceOnErrorSignal(); |