diff options
| -rw-r--r-- | compilerplugins/clang/vclwidgets.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx index 559b70c58538..2b1da0280ca5 100644 --- a/compilerplugins/clang/vclwidgets.cxx +++ b/compilerplugins/clang/vclwidgets.cxx @@ -273,8 +273,11 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) { } // Apparently I should be doing some kind of lookup for a partial specialisations of std::iterator_traits<T> to see if an // object is an iterator, but that sounds like too much work - std::string s = pVarDecl->getType().getDesugaredType(compiler.getASTContext()).getAsString(); - if (s.find("iterator") != std::string::npos) { + auto t = pVarDecl->getType().getDesugaredType(compiler.getASTContext()); + std::string s = t.getAsString(); + if (s.find("iterator") != std::string::npos + || loplugin::TypeCheck(t).Class("__wrap_iter").StdNamespace()) + { return true; } // std::pair seems to show up in whacky ways in clang's AST. Sometimes it's a class, sometimes it's a typedef, and sometimes |