[Libreoffice-commits] dev-tools.git: clang/find-unprefixed-members.cxx clang/README clang/rename.cxx

[Miklos Vajna]

 clang/README                      |    2 +-
 clang/find-unprefixed-members.cxx |    7 +++++++
 clang/rename.cxx                  |   13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 2f66dd8283d24a7860279671e544bf138d7f9555
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Nov 11 08:59:02 2015 +0100

    Fix clang-3.7 build

diff --git a/clang/README b/clang/README
index febf50a..6db3bf3 100644
--- a/clang/README
+++ b/clang/README
@@ -15,7 +15,7 @@ Pros:
 Cons:
 
 - handles only rename of class members so far
-- only tested with clang-3.5.0
+- only tested with clang 3.5/3.7
 
 == Hello world
 
diff --git a/clang/find-unprefixed-members.cxx b/clang/find-unprefixed-members.cxx
index 1ca5a08..c79647a 100644
--- a/clang/find-unprefixed-members.cxx
+++ b/clang/find-unprefixed-members.cxx
@@ -171,10 +171,17 @@ public:
     {
     }
 
+#if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3
+    std::unique_ptr<clang::ASTConsumer> newASTConsumer()
+    {
+        return llvm::make_unique<ASTConsumer>(m_rContext);
+    }
+#else
     clang::ASTConsumer* newASTConsumer()
     {
         return new ASTConsumer(m_rContext);
     }
+#endif
 };
 
 int main(int argc, const char** argv)
diff --git a/clang/rename.cxx b/clang/rename.cxx
index 0ef8886..4f80ebd 100644
--- a/clang/rename.cxx
+++ b/clang/rename.cxx
@@ -211,9 +211,15 @@ public:
                 if (!pEntry)
                     continue;
                 std::string aNewName = getNewName(*pEntry);
+#if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3
+                std::error_code aError;
+                std::unique_ptr<llvm::raw_fd_ostream> pStream(new llvm::raw_fd_ostream(aNewName, aError, llvm::sys::fs::F_None));
+                if (!aError)
+#else
                 std::string aError;
                 std::unique_ptr<llvm::raw_fd_ostream> pStream(new llvm::raw_fd_ostream(aNewName.c_str(), aError, llvm::sys::fs::F_None));
                 if (aError.empty())
+#endif
                     it->second.write(*pStream);
             }
         }
@@ -230,10 +236,17 @@ public:
     {
     }
 
+#if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3
+    std::unique_ptr<clang::ASTConsumer> newASTConsumer()
+    {
+        return llvm::make_unique<RenameASTConsumer>(mrRewriter);
+    }
+#else
     clang::ASTConsumer* newASTConsumer()
     {
         return new RenameASTConsumer(mrRewriter);
     }
+#endif
 };
 
 /// Parses rCsv and puts the first two column of it into rNameMap.