diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-09-20 19:37:48 -0400 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-21 13:53:47 +0000 |
| commit | ef779d339e202dacea30b68ca8014207171e9ce4 (patch) | |
| tree | 01dd70ab402cedb19c42dfb3ebcc32b02e01d3fd | |
| parent | f09a91630c767370871389c28b81280807513431 (diff) | |
tdf#94389 compilerplugins: clang 3.7.0
Fix errors that occur in build with clang 3.7.0
Change-Id: I0e8743f2b6a288d10b4e78e884ce34cfca4dd77c
Reviewed-on: https://gerrit.libreoffice.org/18738
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | compilerplugins/clang/compat.hxx | 6 | ||||
| -rw-r--r-- | compilerplugins/clang/refcounting.cxx | 2 | ||||
| -rw-r--r-- | compilerplugins/clang/staticmethods.cxx | 2 | ||||
| -rw-r--r-- | compilerplugins/clang/unusedvariablecheck.cxx | 2 | ||||
| -rw-r--r-- | compilerplugins/clang/vclwidgets.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx index 22ed14b45460..0ca37fad982f 100644 --- a/compilerplugins/clang/compat.hxx +++ b/compilerplugins/clang/compat.hxx @@ -71,7 +71,7 @@ inline bool forallBases( void* callbackParam, bool AllowShortCircuit) { -#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3 +#if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3 (void) callbackParam; return decl.forallBases(BaseMatches, AllowShortCircuit); #else @@ -146,7 +146,7 @@ inline clang::QualType getParamType( inline clang::Stmt::const_child_iterator begin( clang::Stmt::const_child_range const & range) { -#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3 +#if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3 return range.begin(); #else return range.first; @@ -156,7 +156,7 @@ inline clang::Stmt::const_child_iterator begin( inline clang::Stmt::const_child_iterator end( clang::Stmt::const_child_range const & range) { -#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3 +#if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3 return range.end(); #else return range.second; diff --git a/compilerplugins/clang/refcounting.cxx b/compilerplugins/clang/refcounting.cxx index 3a6c715b6268..882d6867f15d 100644 --- a/compilerplugins/clang/refcounting.cxx +++ b/compilerplugins/clang/refcounting.cxx @@ -83,7 +83,7 @@ bool isDerivedFrom(const CXXRecordDecl *decl, const char *pString) { !decl->hasAnyDependentBases() && !compat::forallBases( *decl, -#if __clang_major__ == 3 && __clang_minor__ < 7 +#if __clang_major__ == 3 && __clang_minor__ <= 7 BaseCheckNotSubclass, #else [pString](const CXXRecordDecl *BaseDefinition) -> bool diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index a02348f9205c..42c958dc6b67 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -38,7 +38,7 @@ private: bool BaseCheckNotTestFixtureSubclass( const CXXRecordDecl *BaseDefinition -#if __clang_major__ == 3 && __clang_minor__ < 7 +#if __clang_major__ == 3 && __clang_minor__ <= 7 , void * #endif ) diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx index 80e32b80d5e1..ce35afecafdc 100644 --- a/compilerplugins/clang/unusedvariablecheck.cxx +++ b/compilerplugins/clang/unusedvariablecheck.cxx @@ -51,7 +51,7 @@ void UnusedVariableCheck::run() bool BaseCheckNotDialogSubclass( const CXXRecordDecl *BaseDefinition -#if __clang_major__ == 3 && __clang_minor__ < 7 +#if __clang_major__ == 3 && __clang_minor__ <= 7 , void * #endif ) diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx index ea0cdffecabb..6873ae282b43 100644 --- a/compilerplugins/clang/vclwidgets.cxx +++ b/compilerplugins/clang/vclwidgets.cxx @@ -59,7 +59,7 @@ static bool startsWith(const std::string& s, const char* other) bool BaseCheckNotWindowSubclass( const CXXRecordDecl *BaseDefinition -#if __clang_major__ == 3 && __clang_minor__ < 7 +#if __clang_major__ == 3 && __clang_minor__ <= 7 , void * #endif ) |