[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/store/nullptr.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 986c495052d165308f9cd1039cf6f6d9b8dbcf7c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 10 11:26:03 2015 +0100

    Missing isInLokIncludeFile check
    
    Change-Id: I6577987f3f3717337e6607ffbe38397f229978f0

diff --git a/compilerplugins/clang/store/nullptr.cxx b/compilerplugins/clang/store/nullptr.cxx
index 83812d0..5b38bbf 100644
--- a/compilerplugins/clang/store/nullptr.cxx
+++ b/compilerplugins/clang/store/nullptr.cxx
@@ -112,6 +112,8 @@ bool Nullptr::VisitImplicitCastExpr(CastExpr const * expr) {
                             .getImmediateExpansionRange(loc).first;
                         if (isInUnoIncludeFile(
                                 compiler.getSourceManager().getSpellingLoc(loc))
+                            || isInLokIncludeFile(
+                                compiler.getSourceManager().getSpellingLoc(loc))
                             || isFromCIncludeFile(
                                 compiler.getSourceManager().getSpellingLoc(
                                     loc)))