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

JK2: Remove mismatched allocator from std::map typedefs #986

Merged
merged 3 commits into from Sep 17, 2018

Conversation

Projects
None yet
3 participants
@smcv
Contributor

smcv commented Aug 6, 2018

The Allocator is meant to be one that is suitable for allocating
std::pair<key, value> instances, not value instances, and the
Standard C++ library provided by gcc 8 asserts that the types match.
The closest valid allocator here would be
std::allocator<std::pair<key, value>>, but that is the default for
this template anyway, so we can just omit it.

Closes: #985
Bug-Debian: https://bugs.debian.org/905477
Signed-off-by: Simon McVittie smcv@debian.org

smcv added some commits Aug 9, 2018

macOS CI: Upgrade Homebrew packages before installing
Travis-CI's macOS worker image currently has libpng installed at a
slightly outdated version. Unlike "apt install", "brew install"
will not upgrade a package that is already installed, and will exit
unsuccessfully when asked to do so. There does not seem to be a
Homebrew command for "upgrade these packages if installed, or install
them if not installed", so the most straightforward way seems to be
to upgrade everything before invoking brew install.

Fixes: #987
JK2: Remove mismatched allocator from std::map typedefs
The Allocator is meant to be one that is suitable for allocating
std::pair<key, value> instances, not value instances, and the
Standard C++ library provided by gcc 8 asserts that the types match.
The closest valid allocator here would be
std::allocator<std::pair<key, value>>, but that is the default for
this template anyway, so we can just omit it.

Closes: #985
Bug-Debian: https://bugs.debian.org/905477
Signed-off-by: Simon McVittie <smcv@debian.org>
@Razish

Razish approved these changes Aug 25, 2018

@smcv

This comment has been minimized.

Show comment
Hide comment
@smcv

smcv Sep 17, 2018

Contributor

If this branch is OK, please could someone merge it?

Contributor

smcv commented Sep 17, 2018

If this branch is OK, please could someone merge it?

@xycaleth xycaleth merged commit cc4094c into JACoders:master Sep 17, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment