mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:stylepolice: adapt to libc++

Browse Source 
Change-Id: I8a471d0fb7a206f1a235c3019ae9d07b44056e01
This commit is contained in:
Stephan Bergmann
2016-04-27 09:48:56 +02:00
parent a4da4cc660
commit 49f2d7cd98
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compilerplugins/clang/stylepolice.cxx
View File

@@ -108,11 +108,15 @@ bool StylePolice::VisitVarDecl(const VarDecl * varDecl)
&& !startswith(typeName, "rtl::Reference") && !startswith(typeName, "rtl::Reference")
&& !startswith(typeName, "ScopedVclPtr") && !startswith(typeName, "ScopedVclPtr")
&& !startswith(typeName, "std::mem_fun") && !startswith(typeName, "std::mem_fun")
&& !startswith(typeName, "std::__1::mem_fun")
&& !startswith(typeName, "std::shared_ptr") && !startswith(typeName, "std::shared_ptr")
&& !startswith(typeName, "std::__1::shared_ptr")
&& !startswith(typeName, "shared_ptr") // weird issue in slideshow && !startswith(typeName, "shared_ptr") // weird issue in slideshow
&& !startswith(typeName, "std::unique_ptr") && !startswith(typeName, "std::unique_ptr")
&& !startswith(typeName, "std::__1::unique_ptr")
&& !startswith(typeName, "unique_ptr") // weird issue in include/vcl/threadex.hxx && !startswith(typeName, "unique_ptr") // weird issue in include/vcl/threadex.hxx
&& !startswith(typeName, "std::weak_ptr") && !startswith(typeName, "std::weak_ptr")
&& !startswith(typeName, "std::__1::weak_ptr")
&& !startswith(typeName, "struct _LOKDocViewPrivate") && !startswith(typeName, "struct _LOKDocViewPrivate")
&& !startswith(typeName, "sw::UnoCursorPointer") && !startswith(typeName, "sw::UnoCursorPointer")
&& !startswith(typeName, "tools::SvRef") && !startswith(typeName, "tools::SvRef")
@@ -120,6 +124,8 @@ bool StylePolice::VisitVarDecl(const VarDecl * varDecl)
&& !startswith(typeName, "vcl::ScopedBitmapAccess") && !startswith(typeName, "vcl::ScopedBitmapAccess")
// lots of the code seems to regard iterator objects as being "pointer-like" // lots of the code seems to regard iterator objects as being "pointer-like"
&& typeName.find("iterator<") == std::string::npos && typeName.find("iterator<") == std::string::npos
&& typeName.find("iter<") == std::string::npos
// libc++ std::__1::__wrap_iter<...>
&& aOriginalTypeName != "sal_IntPtr" ) && aOriginalTypeName != "sal_IntPtr" )
{ {
if (aFileName.startswith(SRCDIR "/bridges/") ) { if (aFileName.startswith(SRCDIR "/bridges/") ) {