Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wayland] fix compilation with C++17 #15790

Merged
merged 1 commit into from Mar 21, 2019

Conversation

Projects
None yet
2 participants
@olafhering
Copy link
Contributor

commented Mar 21, 2019

Compilation for Wayland/gles fails with --std=c++17 because it has
stricter checks:

error: static assertion failed: comparison object must be invocable as const

Fix this error by declaring the result as const.

Fixes #15788

Signed-off-by: Olaf Hering olaf@aepfle.de

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed
@pkerling

This comment has been minimized.

Copy link
Member

commented Mar 21, 2019

Thanks! If it's not too much effort, change the [wayland} to [wayland] in the commit message, force-push and we're good to go.

[wayland] fix compilation with C++17
Compilation for Wayland/gles fails with --std=c++17 because it has
stricter checks:

error: static assertion failed: comparison object must be invocable as const

Fix this error by declaring the result as const.

Fixes #15788

Signed-off-by: Olaf Hering <olaf@aepfle.de>

@olafhering olafhering force-pushed the olafhering:WaylandCXX17 branch from e286950 to 7db4a56 Mar 21, 2019

@Rechi Rechi changed the title [wayland} fix compilation with C++17 [wayland] fix compilation with C++17 Mar 21, 2019

@pkerling pkerling added this to the Leia 18.2-rc1 milestone Mar 21, 2019

@pkerling pkerling merged commit a1fbe71 into xbmc:master Mar 21, 2019

1 check passed

default You're awesome. Have a cookie
Details
@pkerling

This comment has been minimized.

Copy link
Member

commented Mar 21, 2019

Thanks! Btw you have to leave some comment after force-pushing because GitHub unfortunately does not notify in that case

@olafhering olafhering deleted the olafhering:WaylandCXX17 branch Apr 2, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.