diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-15 14:20:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-19 22:08:38 +0100 |
| commit | 9663341f9249c739219ffe6cccf3762aa8dd78f3 (patch) | |
| tree | 2b22177d01916abca8314b0834185892a8f77030 /compilerplugins/clang/expandablemethods.cxx | |
| parent | 00bc5a097313fbd003675267be961ad3a152ba42 (diff) | |
Bump --enable-compiler-plugins to Clang 3.8.0
<https://lists.freedesktop.org/archives/libreoffice/2017-December/079107.html>
"Clang baseline bump"
Change-Id: I18fca8794ea34118fc6308458064d0c28cf5caf7
Reviewed-on: https://gerrit.libreoffice.org/46557
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'compilerplugins/clang/expandablemethods.cxx')
| -rw-r--r-- | compilerplugins/clang/expandablemethods.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compilerplugins/clang/expandablemethods.cxx b/compilerplugins/clang/expandablemethods.cxx index 2f2c3a2d68db..6d70ad81cefa 100644 --- a/compilerplugins/clang/expandablemethods.cxx +++ b/compilerplugins/clang/expandablemethods.cxx @@ -116,11 +116,8 @@ MyFuncInfo ExpandableMethods::niceName(const FunctionDecl* functionDecl) functionDecl = functionDecl->getInstantiatedFromMemberFunction(); else if (functionDecl->getClassScopeSpecializationPattern()) functionDecl = functionDecl->getClassScopeSpecializationPattern(); -// workaround clang-3.5 issue -#if CLANG_VERSION >= 30600 else if (functionDecl->getTemplateInstantiationPattern()) functionDecl = functionDecl->getTemplateInstantiationPattern(); -#endif MyFuncInfo aInfo; switch (functionDecl->getAccess()) @@ -131,7 +128,7 @@ MyFuncInfo ExpandableMethods::niceName(const FunctionDecl* functionDecl) default: aInfo.access = "unknown"; break; } if (!isa<CXXConstructorDecl>(functionDecl)) { - aInfo.returnType = compat::getReturnType(*functionDecl).getCanonicalType().getAsString(); + aInfo.returnType = functionDecl->getReturnType().getCanonicalType().getAsString(); } else { aInfo.returnType = ""; } |