From fb68e640d2763e45b64bd8de81247c7f1a0a651d Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 28 Apr 2014 10:06:50 +0000 Subject: [PATCH] Try to fix the build. newFrontendActionFactory was changed to return a unique_ptr. llvm-svn: 207407 --- clang-tools-extra/clang-modernize/tool/ClangModernize.cpp | 2 +- clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp | 2 +- clang-tools-extra/tool-template/ToolTemplate.cpp | 2 +- .../unittests/clang-modernize/TransformTest.cpp | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp index 97862a0ae6fb..ce5dcd0cada2 100644 --- a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp +++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp @@ -469,7 +469,7 @@ int main(int argc, const char **argv) { if (FinalSyntaxCheck) { ClangTool SyntaxTool(*Compilations, SourcePaths); - if (SyntaxTool.run(newFrontendActionFactory()) != 0) + if (SyntaxTool.run(newFrontendActionFactory().get()) != 0) return 1; } diff --git a/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp b/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp index 21ccc5ba1d15..768e4fa7c1f6 100644 --- a/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp +++ b/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp @@ -233,5 +233,5 @@ int main(int argc, const char **argv) { callee(methodDecl(hasName(StringCStrMethod))), on(id("arg", expr())))))), &Callback); - return Tool.runAndSave(newFrontendActionFactory(&Finder)); + return Tool.runAndSave(newFrontendActionFactory(&Finder).get()); } diff --git a/clang-tools-extra/tool-template/ToolTemplate.cpp b/clang-tools-extra/tool-template/ToolTemplate.cpp index 7be964f97831..48a44acc4add 100644 --- a/clang-tools-extra/tool-template/ToolTemplate.cpp +++ b/clang-tools-extra/tool-template/ToolTemplate.cpp @@ -103,5 +103,5 @@ int main(int argc, const char **argv) { // Use Finder.addMatcher(...) to define the patterns in the AST that you // want to match against. You are not limited to just one matcher! - return Tool.run(newFrontendActionFactory(&Finder)); + return Tool.run(newFrontendActionFactory(&Finder).get()); } diff --git a/clang-tools-extra/unittests/clang-modernize/TransformTest.cpp b/clang-tools-extra/unittests/clang-modernize/TransformTest.cpp index fe86f9431cd1..d1a8e7852bc5 100644 --- a/clang-tools-extra/unittests/clang-modernize/TransformTest.cpp +++ b/clang-tools-extra/unittests/clang-modernize/TransformTest.cpp @@ -153,7 +153,8 @@ TEST(Transform, Timings) { // handleEndSource() calls to it. CallbackForwarder Callbacks(T); - Tool.run(clang::tooling::newFrontendActionFactory(&Factory, &Callbacks)); + Tool.run( + clang::tooling::newFrontendActionFactory(&Factory, &Callbacks).get()); EXPECT_TRUE(Factory.Called); Transform::TimingVec::const_iterator I = T.timing_begin(); @@ -271,7 +272,7 @@ TEST(Transform, isFileModifiable) { DummyTransform T("dummy", Options); MatchFinder Finder; Finder.addMatcher(varDecl().bind("decl"), new ModifiableCallback(T)); - Tool.run(tooling::newFrontendActionFactory(&Finder)); + Tool.run(tooling::newFrontendActionFactory(&Finder).get()); } TEST(VersionTest, Interface) {