Skip to content

/Cataclysm-DDA

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

[BUILD FIX] Remove an extraneous bracket and add missing comma. #23015

Merged
merged 2 commits into from Feb 22, 2018

Conversation

Reviewers
No reviews
Assignees

@illi-kun illi-kun

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@kevingranade @illi-kun
@kevingranade
Copy link
Member

commented Feb 22, 2018 •
edited

Somehow failed to commit my fixes to this after merging.

Fixes #23013
@kevingranade
Remove an extraneous bracket. 
Somehow failed to commit my fix to this after merging.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
78ddbb1

@kevingranade kevingranade changed the title Remove an extraneous bracket. [BUILD FIX] Remove an extraneous bracket. Feb 22, 2018

@boydkr boydkr referenced this pull request Feb 22, 2018

Closed

Linux Build Failure #23013

@kevingranade
Add a comma. 
Obscure c++ trivia time.
If you put two literal strings adjacent to each other (i.e. seperated only by whitespace), the c++ preprocessor will concatenate them, so:
```
        "acid_anthill"
        "anthill",
```
resoilves to:
``` "acidanthillanthill"```
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d82b63e

@kevingranade kevingranade changed the title [BUILD FIX] Remove an extraneous bracket. [BUILD FIX] Remove an extraneous bracket and add missing comma. Feb 22, 2018

@illi-kun illi-kun self-assigned this Feb 22, 2018

@illi-kun illi-kun merged commit 76aaaa1 into master Feb 22, 2018
4 checks passed

4 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.06%) to 23.455%
Details
gorgon-ghprb Build finished.
Details

@Leland Leland deleted the kevingranade-post-antacid-fix branch Mar 7, 2018

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.