From 193957750ab857dc5e01ee7259964ee92a54ee0d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 26 Feb 2015 17:21:37 +0100
Subject: Adapt compilerplugins to Clang trunk towards 3.7

Change-Id: I5b41039bf63a4c2f313fe7a57c0f6934dcb0752d
---
 compilerplugins/clang/compat.hxx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'compilerplugins/clang/compat.hxx')

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 66963db88a63..dd1d7e3537c2 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -176,9 +176,15 @@ inline std::unique_ptr<llvm::raw_fd_ostream> create_raw_fd_ostream(
 #endif
 }
 
-inline clang::NamedDecl * const * begin(
-    clang::DeclContextLookupConstResult const & result)
-{
+#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3
+typedef clang::DeclContext::lookup_result DeclContextLookupResult;
+typedef clang::DeclContext::lookup_iterator DeclContextLookupIterator;
+#else
+typedef clang::DeclContext::lookup_const_result DeclContextLookupResult;
+typedef clang::DeclContext::lookup_const_iterator DeclContextLookupIterator;
+#endif
+
+inline DeclContextLookupIterator begin(DeclContextLookupResult const & result) {
 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
     return result.begin();
 #else
@@ -186,9 +192,7 @@ inline clang::NamedDecl * const * begin(
 #endif
 }
 
-inline clang::NamedDecl * const * end(
-    clang::DeclContextLookupConstResult const & result)
-{
+inline DeclContextLookupIterator end(DeclContextLookupResult const & result) {
 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
     return result.end();
 #else
-- 
cgit