Skip to content

Commit 1cd1069

Browse files
noblednobled
committed
drop more llvm:: prefixes on OwningPtr<>
More cleanup after r149798. llvm-svn: 150379
1 parent 01b2c9e commit 1cd1069

File tree

12 files changed

+29
-29
lines changed

12 files changed

+29
-29
lines changed

‎clang/examples/analyzer-plugin/MainCallChecker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using namespace ento;
88

99
namespace {
1010
class MainCallChecker : public Checker < check::PreStmt<CallExpr> > {
11-
mutable llvm::OwningPtr<BugType> BT;
11+
mutable OwningPtr<BugType> BT;
1212

1313
public:
1414
void checkPreStmt(const CallExpr *CE, CheckerContext &C) const;

‎clang/examples/clang-interpreter/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static int Execute(llvm::Module *Mod, char * const *envp) {
4646
llvm::InitializeNativeTarget();
4747

4848
std::string Error;
49-
llvm::OwningPtr<llvm::ExecutionEngine> EE(
49+
OwningPtr<llvm::ExecutionEngine> EE(
5050
llvm::ExecutionEngine::createJIT(Mod, &Error));
5151
if (!EE) {
5252
llvm::errs() << "unable to make execution engine: " << Error << "\n";
@@ -83,7 +83,7 @@ int main(int argc, const char **argv, char * const *envp) {
8383
// (basically, exactly one input, and the operation mode is hard wired).
8484
llvm::SmallVector<const char *, 16> Args(argv, argv + argc);
8585
Args.push_back("-fsyntax-only");
86-
llvm::OwningPtr<Compilation> C(TheDriver.BuildCompilation(Args));
86+
OwningPtr<Compilation> C(TheDriver.BuildCompilation(Args));
8787
if (!C)
8888
return 0;
8989

@@ -108,7 +108,7 @@ int main(int argc, const char **argv, char * const *envp) {
108108

109109
// Initialize a compiler invocation object from the clang (-cc1) arguments.
110110
const driver::ArgStringList &CCArgs = Cmd->getArguments();
111-
llvm::OwningPtr<CompilerInvocation> CI(new CompilerInvocation);
111+
OwningPtr<CompilerInvocation> CI(new CompilerInvocation);
112112
CompilerInvocation::CreateFromArgs(*CI,
113113
const_cast<const char **>(CCArgs.data()),
114114
const_cast<const char **>(CCArgs.data()) +
@@ -140,7 +140,7 @@ int main(int argc, const char **argv, char * const *envp) {
140140
CompilerInvocation::GetResourcesPath(argv[0], MainAddr);
141141

142142
// Create and execute the frontend to generate an LLVM bitcode module.
143-
llvm::OwningPtr<CodeGenAction> Act(new EmitLLVMOnlyAction());
143+
OwningPtr<CodeGenAction> Act(new EmitLLVMOnlyAction());
144144
if (!Clang.ExecuteAction(*Act))
145145
return 1;
146146

‎clang/examples/wpa/clang-wpa.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int main(int argc, char **argv) {
9494
= CompilerInstance::createDiagnostics(DiagOpts, argc, argv);
9595
for (unsigned i = 0, e = InputFilenames.size(); i != e; ++i) {
9696
const std::string &InFile = InputFilenames[i];
97-
llvm::OwningPtr<ASTUnit> AST(ASTUnit::LoadFromASTFile(InFile, Diags,
97+
OwningPtr<ASTUnit> AST(ASTUnit::LoadFromASTFile(InFile, Diags,
9898
FileSystemOptions(),
9999
false, 0, 0, true));
100100
if (!AST)
@@ -104,7 +104,7 @@ int main(int argc, char **argv) {
104104
}
105105

106106
if (ViewCallGraph) {
107-
llvm::OwningPtr<CallGraph> CG;
107+
OwningPtr<CallGraph> CG;
108108
CG.reset(new CallGraph(Prog));
109109

110110
for (unsigned i = 0, e = ASTUnits.size(); i != e; ++i)
@@ -154,7 +154,7 @@ int main(int argc, char **argv) {
154154
if (PP.getLangOptions().ObjC1)
155155
Opts.CheckersControlList.push_back(std::make_pair("cocoa", true));
156156

157-
llvm::OwningPtr<ento::CheckerManager> checkerMgr;
157+
OwningPtr<ento::CheckerManager> checkerMgr;
158158
checkerMgr.reset(ento::registerCheckers(Opts, PP.getLangOptions(),
159159
PP.getDiagnostics()));
160160

‎clang/tools/arcmt-test/arcmt-test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static bool performTransformations(StringRef resourcesPath,
177177
origCI.getMigratorOpts().NoFinalizeRemoval);
178178
assert(!transforms.empty());
179179

180-
llvm::OwningPtr<PrintTransforms> transformPrinter;
180+
OwningPtr<PrintTransforms> transformPrinter;
181181
if (OutputTransformations)
182182
transformPrinter.reset(new PrintTransforms(llvm::outs()));
183183

‎clang/tools/driver/cc1_main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static int cc1_test(DiagnosticsEngine &Diags,
117117

118118
int cc1_main(const char **ArgBegin, const char **ArgEnd,
119119
const char *Argv0, void *MainAddr) {
120-
llvm::OwningPtr<CompilerInstance> Clang(new CompilerInstance());
120+
OwningPtr<CompilerInstance> Clang(new CompilerInstance());
121121
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
122122

123123
// Run clang -cc1 test.

‎clang/tools/driver/cc1as_main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ int cc1as_main(const char **ArgBegin, const char **ArgEnd,
411411

412412
// Honor -help.
413413
if (Asm.ShowHelp) {
414-
llvm::OwningPtr<driver::OptTable> Opts(driver::createCC1AsOptTable());
414+
OwningPtr<driver::OptTable> Opts(driver::createCC1AsOptTable());
415415
Opts->PrintHelp(llvm::outs(), "clang -cc1as", "Clang Integrated Assembler");
416416
return 0;
417417
}

‎clang/tools/driver/driver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static void ExpandArgsFromBuf(const char *Arg,
186186
SmallVectorImpl<const char*> &ArgVector,
187187
std::set<std::string> &SavedStrings) {
188188
const char *FName = Arg + 1;
189-
llvm::OwningPtr<llvm::MemoryBuffer> MemBuf;
189+
OwningPtr<llvm::MemoryBuffer> MemBuf;
190190
if (llvm::MemoryBuffer::getFile(FName, MemBuf)) {
191191
ArgVector.push_back(SaveStringInSet(SavedStrings, Arg));
192192
return;
@@ -448,7 +448,7 @@ int main(int argc_, const char **argv_) {
448448
argv.insert(&argv[1], ExtraArgs.begin(), ExtraArgs.end());
449449
}
450450

451-
llvm::OwningPtr<Compilation> C(TheDriver.BuildCompilation(argv));
451+
OwningPtr<Compilation> C(TheDriver.BuildCompilation(argv));
452452
int Res = 0;
453453
const Command *FailingCommand = 0;
454454
if (C.get())

‎clang/tools/libclang/ARCMigrate.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ CXRemapping clang_getRemappings(const char *migrate_dir_path) {
5656
}
5757

5858
TextDiagnosticBuffer diagBuffer;
59-
llvm::OwningPtr<Remap> remap(new Remap());
59+
OwningPtr<Remap> remap(new Remap());
6060

6161
bool err = arcmt::getFileRemappings(remap->Vec, migrate_dir_path,&diagBuffer);
6262

‎clang/tools/libclang/CIndex.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,7 +2457,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) {
24572457
llvm::CrashRecoveryContextReleaseRefCleanup<DiagnosticsEngine> >
24582458
DiagCleanup(Diags.getPtr());
24592459

2460-
llvm::OwningPtr<std::vector<ASTUnit::RemappedFile> >
2460+
OwningPtr<std::vector<ASTUnit::RemappedFile> >
24612461
RemappedFiles(new std::vector<ASTUnit::RemappedFile>());
24622462

24632463
// Recover resources if we crash before exiting this function.
@@ -2472,7 +2472,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) {
24722472
Buffer));
24732473
}
24742474

2475-
llvm::OwningPtr<std::vector<const char *> >
2475+
OwningPtr<std::vector<const char *> >
24762476
Args(new std::vector<const char*>());
24772477

24782478
// Recover resources if we crash before exiting this method.
@@ -2516,7 +2516,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) {
25162516
}
25172517

25182518
unsigned NumErrors = Diags->getClient()->getNumErrors();
2519-
llvm::OwningPtr<ASTUnit> Unit(
2519+
OwningPtr<ASTUnit> Unit(
25202520
ASTUnit::LoadFromCommandLine(Args->size() ? &(*Args)[0] : 0
25212521
/* vector::data() not portable */,
25222522
Args->size() ? (&(*Args)[0] + Args->size()) :0,
@@ -2658,7 +2658,7 @@ static void clang_reparseTranslationUnit_Impl(void *UserData) {
26582658
ASTUnit *CXXUnit = static_cast<ASTUnit *>(TU->TUData);
26592659
ASTUnit::ConcurrencyCheck Check(*CXXUnit);
26602660

2661-
llvm::OwningPtr<std::vector<ASTUnit::RemappedFile> >
2661+
OwningPtr<std::vector<ASTUnit::RemappedFile> >
26622662
RemappedFiles(new std::vector<ASTUnit::RemappedFile>());
26632663

26642664
// Recover resources if we crash before exiting this function.
@@ -5448,7 +5448,7 @@ CXTUResourceUsage clang_getCXTUResourceUsage(CXTranslationUnit TU) {
54485448
}
54495449

54505450
ASTUnit *astUnit = static_cast<ASTUnit*>(TU->TUData);
5451-
llvm::OwningPtr<MemUsageEntries> entries(new MemUsageEntries());
5451+
OwningPtr<MemUsageEntries> entries(new MemUsageEntries());
54525452
ASTContext &astContext = astUnit->getASTContext();
54535453

54545454
// How much memory is used by AST nodes and types?

‎clang/tools/libclang/CIndexUSRs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using namespace clang::cxstring;
3030

3131
namespace {
3232
class USRGenerator : public DeclVisitor<USRGenerator> {
33-
llvm::OwningPtr<llvm::SmallString<128> > OwnedBuf;
33+
OwningPtr<llvm::SmallString<128> > OwnedBuf;
3434
SmallVectorImpl<char> &Buf;
3535
llvm::raw_svector_ostream Out;
3636
bool IgnoreResults;

0 commit comments

Comments
 (0)