From 064bebc0ee272637f88307d0a6022f186f003af6 Mon Sep 17 00:00:00 2001
From: Sergio Martins <iamsergio@gmail.com>
Date: Thu, 20 Sep 2018 18:09:15 +0100
Subject: Move getImmediateExpansionRange to SourceCompatibilityHelpers.h

---
 src/SourceCompatibilityHelpers.h        | 10 ++++++++++
 src/checks/level2/old-style-connect.cpp | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
index 45539ec8..da46bced 100644
--- a/src/SourceCompatibilityHelpers.h
+++ b/src/SourceCompatibilityHelpers.h
@@ -24,6 +24,7 @@
 #define SOURCE_COMPAT_HELPERS
 
 #include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
 
 template <typename T>
 inline clang::SourceLocation getLocStart(const T *t)
@@ -45,5 +46,14 @@ inline clang::SourceLocation getLocEnd(const T *t)
 #endif
 }
 
+inline clang::CharSourceRange getImmediateExpansionRange(clang::SourceLocation macroLoc, const clang::SourceManager &sm)
+{
+#if LLVM_VERSION_MAJOR >= 7
+    return sm.getImmediateExpansionRange(macroLoc);
+#else
+    auto pair = sm.getImmediateExpansionRange(macroLoc);
+    return clang::CharSourceRange(clang::SourceRange(pair.first, pair.second), false);
+#endif
+}
 
 #endif
diff --git a/src/checks/level2/old-style-connect.cpp b/src/checks/level2/old-style-connect.cpp
index 4f2b7365..ebc4acca 100644
--- a/src/checks/level2/old-style-connect.cpp
+++ b/src/checks/level2/old-style-connect.cpp
@@ -67,16 +67,6 @@ static bool classIsOk(StringRef className)
     return className != "QDBusInterface";
 }
 
-static CharSourceRange getImmediateExpansionRange(SourceLocation macroLoc, const SourceManager &sm)
-{
-#if LLVM_VERSION_MAJOR >= 7
-    return sm.getImmediateExpansionRange(macroLoc);
-#else
-    auto pair = sm.getImmediateExpansionRange(macroLoc);
-    return CharSourceRange(SourceRange(pair.first, pair.second), false);
-#endif
-}
-
 OldStyleConnect::OldStyleConnect(const std::string &name, ClazyContext *context)
     : CheckBase(name, context, Option_CanIgnoreIncludes)
 {
-- 
cgit v1.2.3