Port to LLVM/Clang SVN r215464 (trunk)

The clang::FrontendAction::CreateASTConsumer method now returns
std::unique_ptr<clang::ASTConsumer>, so update our override to return
the same type.  While at it, mark our declaration with 'override'.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/RunClang.cxx b/src/RunClang.cxx
index 224c804..7c4e1f5 100644
--- a/src/RunClang.cxx
+++ b/src/RunClang.cxx
@@ -37,6 +37,7 @@
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Sema/Sema.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/raw_ostream.h"
@@ -157,14 +158,15 @@ public:
 class CastXMLSyntaxOnlyAction:
   public CastXMLPredefines<clang::SyntaxOnlyAction>
 {
-  clang::ASTConsumer* CreateASTConsumer(clang::CompilerInstance &CI,
-                                        llvm::StringRef InFile) {
+  std::unique_ptr<clang::ASTConsumer>
+  CreateASTConsumer(clang::CompilerInstance &CI,
+                    llvm::StringRef InFile) override {
     using llvm::sys::path::filename;
     if(!this->Opts.GccXml) {
       return clang::SyntaxOnlyAction::CreateASTConsumer(CI, InFile);
     } else if(llvm::raw_ostream* OS =
               CI.createDefaultOutputFile(false, filename(InFile), "xml")) {
-      return new ASTConsumer(CI, *OS, this->Opts);
+      return llvm::make_unique<ASTConsumer>(CI, *OS, this->Opts);
     } else {
       return 0;
     }