From b4c9c0d137a9157b4efef213267fc3a6b75ed4b0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 11 Sep 2017 10:48:12 +0200
Subject: More clang::*Type vs. llvm::*Type ambiguities

Change-Id: I21133976793ab018c633dda077029666308526db
---
 compilerplugins/clang/salbool.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'compilerplugins/clang/salbool.cxx')

diff --git a/compilerplugins/clang/salbool.cxx b/compilerplugins/clang/salbool.cxx
index 8f42ef9e2b0f..19c715e13f9b 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -262,7 +262,8 @@ bool SalBool::VisitCallExpr(CallExpr * expr) {
         FunctionDecl const * fd = dyn_cast<FunctionDecl>(d);
         if (fd != nullptr) {
             if (!hasBoolOverload(fd, false)) {
-                PointerType const * pt = fd->getType()->getAs<PointerType>();
+                clang::PointerType const * pt = fd->getType()
+                    ->getAs<clang::PointerType>();
                 QualType t2(
                     pt == nullptr ? fd->getType() : pt->getPointeeType());
                 ft = t2->getAs<FunctionProtoType>();
@@ -275,7 +276,8 @@ bool SalBool::VisitCallExpr(CallExpr * expr) {
         } else {
             VarDecl const * vd = dyn_cast<VarDecl>(d);
             if (vd != nullptr) {
-                PointerType const * pt = vd->getType()->getAs<PointerType>();
+                clang::PointerType const * pt = vd->getType()
+                    ->getAs<clang::PointerType>();
                 ft = (pt == nullptr ? vd->getType() : pt->getPointeeType())
                     ->getAs<FunctionProtoType>();
             }
@@ -290,7 +292,7 @@ bool SalBool::VisitCallExpr(CallExpr * expr) {
                 b = !t.isConstQualified() && isSalBool(t);
             } else if (t->isPointerType()) {
                 for (;;) {
-                    auto t2 = t->getAs<PointerType>();
+                    auto t2 = t->getAs<clang::PointerType>();
                     if (t2 == nullptr) {
                         break;
                     }
@@ -479,7 +481,7 @@ bool SalBool::VisitReturnStmt(ReturnStmt const * stmt) {
         return true;
     }
     for (;;) {
-        auto t2 = t->getAs<PointerType>();
+        auto t2 = t->getAs<clang::PointerType>();
         if (t2 == nullptr) {
             break;
         }
-- 
cgit