LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(core): fix GCC 10 compatibility 

With GCC 10, SOGoAptFormatter.m FTBS with the following error:

    SOGoAptFormatter.m: In function ‘-[SOGoAptFormatter setPrivateTitleOnly]’:
    SOGoAptFormatter.m:104:56: error: expected ‘)’ before ‘::’ token
      104 |   self->formatAction = @selector(titleOnlyForPrivateApt::);

Simply name the second argument, so gcc is happy.

Also add the `external` keyword to a header declared variable.

Fixes #5029
pull/284/head^2
Nicolas Höft 2020-08-19 18:28:30 +02:00 committed by GitHub
parent 72053a5801
commit 8507204e0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/Mailer/SOGoMailObject.h
View File

@ -51,7 +51,7 @@
@class WOResponse; @class WOResponse;
NSArray *SOGoMailCoreInfoKeys; extern NSArray *SOGoMailCoreInfoKeys;
@interface SOGoMailObject : SOGoMailBaseObject @interface SOGoMailObject : SOGoMailBaseObject
{ {

20
UI/SOGoUI/SOGoAptFormatter.m
View File

@ -65,43 +65,43 @@
/* accessors */ /* accessors */
- (void)setTooltip { - (void)setTooltip {
self->formatAction = @selector(tooltipForApt::); self->formatAction = @selector(tooltipForApt:_refDate:);
} }
- (void)setSingleLineFullDetails { - (void)setSingleLineFullDetails {
self->formatAction = @selector(singleLineFullDetailsForApt::); self->formatAction = @selector(singleLineFullDetailsForApt:_refDate:);
} }
- (void)setFullDetails { - (void)setFullDetails {
self->formatAction = @selector(fullDetailsForApt::); self->formatAction = @selector(fullDetailsForApt:_refDate:);
} }
- (void)setPrivateTooltip { - (void)setPrivateTooltip {
self->formatAction = @selector(tooltipForPrivateApt::); self->formatAction = @selector(tooltipForPrivateApt:_refDate:);
} }
- (void)setPrivateDetails { - (void)setPrivateDetails {
self->formatAction = @selector(detailsForPrivateApt::); self->formatAction = @selector(detailsForPrivateApt:_refDate:);
} }
- (void)setTitleOnly { - (void)setTitleOnly {
self->formatAction = @selector(titleForApt::); self->formatAction = @selector(titleForApt:_refDate:);
} }
- (void)setShortTitleOnly { - (void)setShortTitleOnly {
self->formatAction = @selector(shortTitleForApt::); self->formatAction = @selector(shortTitleForApt:_refDate:);
} }
- (void)setShortMonthTitleOnly { - (void)setShortMonthTitleOnly {
self->formatAction = @selector(shortMonthTitleForApt::); self->formatAction = @selector(shortMonthTitleForApt:_refDate:);
} }
- (void)setPrivateSuppressAll { - (void)setPrivateSuppressAll {
self->formatAction = @selector(suppressApt::); self->formatAction = @selector(suppressApt:_refDate:);
} }
- (void)setPrivateTitleOnly { - (void)setPrivateTitleOnly {
self->formatAction = @selector(titleOnlyForPrivateApt::); self->formatAction = @selector(titleOnlyForPrivateApt:_refDate:);
} }
- (void)setPrivateTitle:(NSString *)_privateTitle { - (void)setPrivateTitle:(NSString *)_privateTitle {