mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#94389 compilerplugins: clang 3.7.0

Browse Source 
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>
This commit is contained in:
Daniel Robertson
2015-09-20 19:37:48 -04:00
committed by Stephan Bergmann
parent f09a91630c
commit ef779d339e
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compilerplugins/clang/compat.hxx
View File

@@ -71,7 +71,7 @@ inline bool forallBases(
void* callbackParam, void* callbackParam,
bool AllowShortCircuit) bool AllowShortCircuit)
{ {
#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3 #if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3
(void) callbackParam; (void) callbackParam;
return decl.forallBases(BaseMatches, AllowShortCircuit); return decl.forallBases(BaseMatches, AllowShortCircuit);
#else #else
@@ -146,7 +146,7 @@ inline clang::QualType getParamType(
inline clang::Stmt::const_child_iterator begin( inline clang::Stmt::const_child_iterator begin(
clang::Stmt::const_child_range const & range) 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(); return range.begin();
#else #else
return range.first; return range.first;
@@ -156,7 +156,7 @@ inline clang::Stmt::const_child_iterator begin(
inline clang::Stmt::const_child_iterator end( inline clang::Stmt::const_child_iterator end(
clang::Stmt::const_child_range const & range) 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(); return range.end();
#else #else
return range.second; return range.second;

2
compilerplugins/clang/refcounting.cxx
View File

@@ -83,7 +83,7 @@ bool isDerivedFrom(const CXXRecordDecl *decl, const char *pString) {
!decl->hasAnyDependentBases() && !decl->hasAnyDependentBases() &&
!compat::forallBases( !compat::forallBases(
*decl, *decl,
#if __clang_major__ == 3 && __clang_minor__ < 7 #if __clang_major__ == 3 && __clang_minor__ <= 7
BaseCheckNotSubclass, BaseCheckNotSubclass,
#else #else
[pString](const CXXRecordDecl *BaseDefinition) -> bool [pString](const CXXRecordDecl *BaseDefinition) -> bool

2
compilerplugins/clang/staticmethods.cxx
View File

@@ -38,7 +38,7 @@ private:
bool BaseCheckNotTestFixtureSubclass( bool BaseCheckNotTestFixtureSubclass(
const CXXRecordDecl *BaseDefinition const CXXRecordDecl *BaseDefinition
#if __clang_major__ == 3 && __clang_minor__ < 7 #if __clang_major__ == 3 && __clang_minor__ <= 7
, void * , void *
#endif #endif
) )

2
compilerplugins/clang/unusedvariablecheck.cxx
View File

@@ -51,7 +51,7 @@ void UnusedVariableCheck::run()
bool BaseCheckNotDialogSubclass( bool BaseCheckNotDialogSubclass(
const CXXRecordDecl *BaseDefinition const CXXRecordDecl *BaseDefinition
#if __clang_major__ == 3 && __clang_minor__ < 7 #if __clang_major__ == 3 && __clang_minor__ <= 7
, void * , void *
#endif #endif
) )

2
compilerplugins/clang/vclwidgets.cxx
View File

@@ -59,7 +59,7 @@ static bool startsWith(const std::string& s, const char* other)
bool BaseCheckNotWindowSubclass( bool BaseCheckNotWindowSubclass(
const CXXRecordDecl *BaseDefinition const CXXRecordDecl *BaseDefinition
#if __clang_major__ == 3 && __clang_minor__ < 7 #if __clang_major__ == 3 && __clang_minor__ <= 7
, void * , void *
#endif #endif
) )