From 149858e94e0c6639ddf7a6de6daf176bbc885320 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 5 Dec 2012 15:29:19 +0100
Subject: Adapt to Clang 3.2

Change-Id: I9e51867198d7677c26cbd97f5d9c85ac13dc90c5
---
 compilerplugins/clang/bodynotinblock.cxx      | 1 +
 compilerplugins/clang/lclstaticfix.cxx        | 1 +
 compilerplugins/clang/plugin.cxx              | 1 -
 compilerplugins/clang/plugin.hxx              | 5 +++++
 compilerplugins/clang/postfixincrementfix.cxx | 1 +
 compilerplugins/clang/sallogareas.cxx         | 1 +
 compilerplugins/clang/unusedvariablecheck.cxx | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'compilerplugins')

diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx
index 90f79334db00..a2e79680d8e2 100644
--- a/compilerplugins/clang/bodynotinblock.cxx
+++ b/compilerplugins/clang/bodynotinblock.cxx
@@ -10,6 +10,7 @@
 
 #include "bodynotinblock.hxx"
 
+#include <clang/AST/ASTContext.h>
 #include <clang/Basic/SourceManager.h>
 
 namespace loplugin
diff --git a/compilerplugins/clang/lclstaticfix.cxx b/compilerplugins/clang/lclstaticfix.cxx
index 849fea57b9e8..9227af81282f 100644
--- a/compilerplugins/clang/lclstaticfix.cxx
+++ b/compilerplugins/clang/lclstaticfix.cxx
@@ -10,6 +10,7 @@
 
 #include "lclstaticfix.hxx"
 
+#include <clang/AST/ASTContext.h>
 #include <clang/Basic/SourceManager.h>
 
 /*
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 7ecf5991491f..7138e88b0d9f 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -16,7 +16,6 @@
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Frontend/FrontendAction.h>
 #include <clang/Frontend/FrontendPluginRegistry.h>
-#include <clang/Rewrite/Rewriter.h>
 
 #include "bodynotinblock.hxx"
 #include "lclstaticfix.hxx"
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index b8a48fa97fd1..2a587addcb54 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -12,7 +12,12 @@
 #define PLUGIN_H
 
 #include <clang/AST/RecursiveASTVisitor.h>
+
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
 #include <clang/Rewrite/Rewriter.h>
+#else
+#include <clang/Rewrite/Core/Rewriter.h>
+#endif
 
 using namespace clang;
 using namespace llvm;
diff --git a/compilerplugins/clang/postfixincrementfix.cxx b/compilerplugins/clang/postfixincrementfix.cxx
index ee63b8eb5a02..c5c17fb14b5d 100644
--- a/compilerplugins/clang/postfixincrementfix.cxx
+++ b/compilerplugins/clang/postfixincrementfix.cxx
@@ -10,6 +10,7 @@
 
 #include "postfixincrementfix.hxx"
 
+#include <clang/AST/ASTContext.h>
 #include <clang/Basic/SourceManager.h>
 
 namespace loplugin
diff --git a/compilerplugins/clang/sallogareas.cxx b/compilerplugins/clang/sallogareas.cxx
index 016e004a9669..10630aa3981c 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -10,6 +10,7 @@
 
 #include "sallogareas.hxx"
 
+#include <clang/AST/ASTContext.h>
 #include <clang/Basic/SourceManager.h>
 #include <clang/Lex/Lexer.h>
 
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx
index 7e3bb53c5ba4..fa14b9ca7fb5 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -10,6 +10,7 @@
 
 #include "unusedvariablecheck.hxx"
 
+#include <clang/AST/ASTContext.h>
 #include <clang/Basic/SourceManager.h>
 
 namespace loplugin
-- 
cgit