summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-11-24 10:57:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-24 12:31:35 +0100
commit665d085511a64959ceafd869e6331877ed711c80 (patch)
tree06f341e6bb2d4d7d643b7dda2a130b670e534491 /compilerplugins
parent793b69fe73eb2d6ae4c42f04a66df8c180e42886 (diff)
loplugin:countusersofdefaultparams in sw (1)
Change-Id: I0d14f9c375f93079aef21ca4f1132adc4e1fe06c Reviewed-on: https://gerrit.libreoffice.org/45207 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'compilerplugins')
-rwxr-xr-xcompilerplugins/clang/countusersofdefaultparams.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/compilerplugins/clang/countusersofdefaultparams.py b/compilerplugins/clang/countusersofdefaultparams.py
index a790abfcbd76..c36f91b36dbb 100755
--- a/compilerplugins/clang/countusersofdefaultparams.py
+++ b/compilerplugins/clang/countusersofdefaultparams.py
@@ -9,9 +9,11 @@ callDict = dict()
# clang does not always use exactly the same numbers in the type-parameter vars it generates
# so I need to substitute them to ensure we can match correctly.
-normalizeTypeParamsRegex = re.compile(r"type-parameter-\d+-\d+")
+normalizeTypeParamsRegex1 = re.compile(r"type-parameter-\d+-\d+")
+normalizeTypeParamsRegex2 = re.compile(r"typename enable_if<.*")
def normalizeTypeParams( line ):
- return normalizeTypeParamsRegex.sub("type-parameter-?-?", line)
+ line = normalizeTypeParamsRegex1.sub("type-parameter-?-?", line)
+ return normalizeTypeParamsRegex2.sub("type-parameter-?-?", line)
with io.open("loplugin.countusersofdefaultparams.log", "rb", buffering=1024*1024) as txt:
for line in txt: