diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-20 14:00:23 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-20 14:00:23 +0000 |
| commit | c95d81924d89d92802697ee88e8d0db634869e74 (patch) | |
| tree | ec229811227943ac53f73f440efcafca9838749e /clang/lib/Frontend/ASTMerge.cpp | |
| parent | 862fe49c55e279600d4e9b38d8011c197191f32b (diff) | |
| download | bcm5719-llvm-c95d81924d89d92802697ee88e8d0db634869e74.tar.gz bcm5719-llvm-c95d81924d89d92802697ee88e8d0db634869e74.zip | |
Basic: import IntrusiveRefCntPtr<> into clang namespace
The class name is long enough without the llvm:: added.
Also bring in RefCountedBase and RefCountedBaseVPTR.
llvm-svn: 150958
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index d33e0ea2cdf..f3e6ea85be8 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/lib/Frontend/ASTMerge.cpp @@ -37,10 +37,10 @@ void ASTMergeAction::ExecuteAction() { CI.getASTContext().getLangOptions()); CI.getDiagnostics().SetArgToStringFn(&FormatASTNodeDiagnosticArgument, &CI.getASTContext()); - llvm::IntrusiveRefCntPtr<DiagnosticIDs> + IntrusiveRefCntPtr<DiagnosticIDs> DiagIDs(CI.getDiagnostics().getDiagnosticIDs()); for (unsigned I = 0, N = ASTFiles.size(); I != N; ++I) { - llvm::IntrusiveRefCntPtr<DiagnosticsEngine> + IntrusiveRefCntPtr<DiagnosticsEngine> Diags(new DiagnosticsEngine(DiagIDs, CI.getDiagnostics().getClient(), /*ShouldOwnClient=*/false)); ASTUnit *Unit = ASTUnit::LoadFromASTFile(ASTFiles[I], Diags, |
