From cc82288ff60d78691408ac0e7b1ab64b3ee65b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 11 Oct 2017 17:14:02 +0200 Subject: [PATCH] Travis: Suppress false positive --- .travis_suppressions | 1 + lib/library.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis_suppressions b/.travis_suppressions index 902697cb5..f32d49a30 100644 --- a/.travis_suppressions +++ b/.travis_suppressions @@ -8,6 +8,7 @@ passedByValue:lib/library.h knownConditionTrueFalse:lib/platform.cpp knownConditionTrueFalse:build/* nullPointer:lib/checkother.cpp +nullPointer:build/checkother.cpp *:gui/test* *:test/test.cxx diff --git a/lib/library.cpp b/lib/library.cpp index 4949258f3..e4e4e7880 100644 --- a/lib/library.cpp +++ b/lib/library.cpp @@ -924,9 +924,10 @@ const Library::Container* Library::detectContainer(const Token* typeStart, bool // returns true if ftok is not a library function bool Library::isNotLibraryFunction(const Token *ftok) const { +/* if (ftok->function() && ftok->function()->nestedIn && ftok->function()->nestedIn->type != Scope::eGlobal) return true; - +*/ // variables are not library functions. if (ftok->varId()) return true;