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

Remove old compiler workaround in src/compatibility.h #47536

Merged
merged 2 commits into from
Feb 17, 2021

Conversation

BrettDong
Copy link
Member

@BrettDong BrettDong commented Feb 15, 2021

Summary

Build "Remove old compiler workaround in src/compatibility.h"

Purpose of change

Closes #36370. src/compatibility.h is a workaround to old GCC prior to 4.8 lacking std::to_string and std::advance. But now the minimum supported version is GCC 5.3 (see https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/COMPILING/COMPILER_SUPPORT.md), so this workaround is no longer needed.

Describe the solution

  • First (930a939) migrate all references to proxy function to_string() defined in src/compatibility.h to real std::to_string
  • Then (84f51d7) remove src/compatibility.h

Testing

Compiles locally for me. Wait and see if this compiles on all CI environments as well.

So far GitHub Action and Travis CI checks have all passed but AppVeyor failed because of time out and there isn't a rebuild button on AppVeyor.

@BrettDong BrettDong added Code: Build Issues regarding different builds and build environments [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style labels Feb 15, 2021
@BrettDong BrettDong requested a review from KorGgenT as a code owner February 15, 2021 19:40
@BrettDong
Copy link
Member Author

Doing a force-push to retrigger timed-out AppVeyor build.

@BrettDong
Copy link
Member Author

AppVeyor still times out.

@ZhilkinSerg ZhilkinSerg merged commit 4990aec into CleverRaven:master Feb 17, 2021
@BrettDong BrettDong deleted the compatibility branch February 20, 2021 04:36
@actual-nh
Copy link
Contributor

@ZhilkinSerg, @BrettDong: Should I put up an issue for the Appveyor builds timing out?

@ZhilkinSerg
Copy link
Contributor

We need a branch that we can use to refresh vcpkg package cache, we can ask Appveyor to increase timeout to 90 minutes (I've seen they do that on request), we can disable building and/or tests.

Maybe think of a way of storing vcpkg cache somewhere or use a specific vcpkg commit, so we won't need to rebuild packages most of the time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style
Projects
None yet
Development

Successfully merging this pull request may close these issues.

compatability.h needs review
3 participants