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

[Stephan Bergmann]

 compilerplugins/clang/badstatics.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 097f8d6dbcb904926dbb04c6fbedda08cbf69c51
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 16:21:51 2015 +0100

    Work around loplugin:badstatics
    
    ...about
    
      static ImplImageTree instance;
    
    in ImplImageTree::get (vcl/source/gdi/impimagetree.cxx) due to
    
      StyleIconSet ImplImageTree::maIconSet;
    
    (of type std::unordered_map<OUString, IconSet, OUStringHash>) due to
    
      IconCache ImplImageTree::IconSet::maIconCache;
    
    (of type std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash>),
    reported at least when building against Mac libc++.  This is a false positive,
    as ImplImageTree::shutDown cleans this up.
    
    Change-Id: Idb1a99aa33f71286e57b31b7adb833e3ee8b5f5a

diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 55d8070..a1336cc 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -134,6 +134,7 @@ public:
                 || name == "g_pHyphIter" // SwEditShell::HyphEnd()
                 || name == "pFieldEditEngine" // ScGlobal::Clear()
                 || name == "xDrawClipDocShellRef" // ScGlobal::Clear()
+                || name == "instance" // ImplImageTree::get()
                ) // these variables appear unproblematic
             {
                 return true;