commit 51ccafd66682ecbccc0a63364291dc7a8f6ec0f0
author Alexander Kornienko <alexfh@google.com> Tue Jan 15 12:20:21 2013 +0000
committer Alexander Kornienko <alexfh@google.com> Tue Jan 15 12:20:21 2013 +0000
tree fca6156871c194578532ee68b42cf8c210083d8d
parent 02d65ee373feb1cb029185aa0de04d0c214eda3d

Resolved merge error with r172323 (llvm::X -> X)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172528 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/ASTDumper.cpp

diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
index 7442959..29680c4 100644
--- a/lib/AST/ASTDumper.cpp
+++ b/lib/AST/ASTDumper.cpp
@@ -1587,7 +1587,7 @@
        &Context.getSourceManager());
 }
 
-void Comment::dump(llvm::raw_ostream &OS, const CommandTraits *Traits,
+void Comment::dump(raw_ostream &OS, const CommandTraits *Traits,
                    const SourceManager *SM) const {
   const FullComment *FC = dyn_cast<FullComment>(this);
   ASTDumper D(OS, Traits, SM);