From 51ccafd66682ecbccc0a63364291dc7a8f6ec0f0 Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Tue, 15 Jan 2013 12:20:21 +0000 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp index 7442959201..29680c47e3 100644 --- a/lib/AST/ASTDumper.cpp +++ b/lib/AST/ASTDumper.cpp @@ -1587,7 +1587,7 @@ void Comment::dump(const ASTContext &Context) const { &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(this); ASTDumper D(OS, Traits, SM); -- 2.40.0