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

[Libreoffice Gerrit user]

 compilerplugins/clang/external.cxx        |    2 +-
 compilerplugins/clang/redundantinline.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7fb708ed9fa4f1586887f9b3b541330aa17bbeae
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Nov 21 12:03:15 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 21 13:58:12 2018 +0100

    Linkage::ModuleLinkage was only introduced in Clang 5
    
    Change-Id: Ib27908cba00ca120b3bd2ea1dc291c29120a27a4
    Reviewed-on: https://gerrit.libreoffice.org/63705
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/external.cxx b/compilerplugins/clang/external.cxx
index d30b8cba3c5f..f0abf52fd52c 100644
--- a/compilerplugins/clang/external.cxx
+++ b/compilerplugins/clang/external.cxx
@@ -252,7 +252,7 @@ private:
             return true;
         }
         if (decl->getLinkageInternal() <
-#if CLANG_VERSION >= 40000
+#if CLANG_VERSION >= 50000
             ModuleLinkage
 #else
             ExternalLinkage
diff --git a/compilerplugins/clang/redundantinline.cxx b/compilerplugins/clang/redundantinline.cxx
index 30f970caf9d2..1c3ea454a955 100644
--- a/compilerplugins/clang/redundantinline.cxx
+++ b/compilerplugins/clang/redundantinline.cxx
@@ -138,7 +138,7 @@ private:
 
     bool handleNonExternalLinkage(FunctionDecl const * decl) {
         if (decl->getLinkageInternal() >=
-#if CLANG_VERSION >= 40000
+#if CLANG_VERSION >= 50000
             ModuleLinkage
 #else
             ExternalLinkage