diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-03-30 11:23:13 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-02 18:25:46 +0200 |
| commit | 80a90a63f1bac43926b26921ef17a30e6698cc40 (patch) | |
| tree | f1026309e228cadc640ff0a83d26050eeac3c0a2 /bin/find-unneeded-includes | |
| parent | State the name of the log file that contains an error (diff) | |
| download | core-80a90a63f1bac43926b26921ef17a30e6698cc40.tar.gz core-80a90a63f1bac43926b26921ef17a30e6698cc40.zip | |
find-unneeded-includes: use a better data structure
Turns out plain dictionary requires keys to be unique.
So we need to store values as lists.
This way there are no more false positives for <set> as in
include/sfx2/linkmgr.hxx and include/sfx2/objsh.hxx
Thanks Miklos for the advice!
Change-Id: Ie2cfb63644d6cbd51171eb95e3bcdd9246343efa
Reviewed-on: https://gerrit.libreoffice.org/69953
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'bin/find-unneeded-includes')
| -rwxr-xr-x | bin/find-unneeded-includes | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 12b5893baac8..c902a6172ac9 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -40,20 +40,21 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules): # Avoid debug STL. debugStl = { - "array": "debug/array", - "bitset": "debug/bitset", - "deque": "debug/deque", - "list": "debug/list", - "map": "debug/map.h", - "set": "debug/set.h", - "set": "debug/multiset.h", - "unordered_map": "debug/unordered_map", - "unordered_set": "debug/unordered_set", - "vector": "debug/vector", + "array": ("debug/array"), + "bitset": ("debug/bitset"), + "deque": ("debug/deque"), + "list": ("debug/list"), + "map": ("debug/map.h"), + "set": ("debug/set.h", "debug/multiset.h"), + "unordered_map": ("debug/unordered_map"), + "unordered_set": ("debug/unordered_set"), + "vector": ("debug/vector"), } - for k, v in debugStl.items(): - if include == k and v in toAdd: - return True + for k, values in debugStl.items(): + if include == k: + for value in values: + if value in toAdd: + return True # Avoid proposing to use libstdc++ internal headers. bits = { |