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.

Sign up for GitHub

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

Jump to bottom

Appease clang (2019-12-06) #35891

Merged
merged 2 commits into from
Dec 6, 2019
Merged

Appease clang (2019-12-06) #35891

merged 2 commits into from
Dec 6, 2019

Conversation

ZhilkinSerg
Copy link
Contributor

@ZhilkinSerg ZhilkinSerg commented Dec 6, 2019 •
edited
Loading

Summary

SUMMARY: None

Additional context:

See https://travis-ci.org/CleverRaven/Cataclysm-DDA/jobs/620154888#L4122

/home/travis/build/CleverRaven/Cataclysm-DDA/src/overmap_ui.cpp:1098:78: error: unnecessary spaces before this location. [cata-text-style,-warnings-as-errors]

                                         _( "Multiple entries separated with , Excludes starting with -\n"

                                                                            ~^

@ZhilkinSerg ZhilkinSerg added Code: Build Issues regarding different builds and build environments [C++] Changes (can be) made in C++. Previously named `Code` labels Dec 6, 2019
Qrox
Qrox reviewed Dec 6, 2019
View reviewed changes
src/overmap_ui.cpp Outdated Show resolved Hide resolved
@ZhilkinSerg @Qrox
Apply suggestions from code review
a42e163 
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
@ZhilkinSerg ZhilkinSerg merged commit 45147cd into master Dec 6, 2019
@weekly-digest weekly-digest bot mentioned this pull request Dec 8, 2019
Closed
@ZhilkinSerg ZhilkinSerg deleted the clang-2019-12-06 branch December 8, 2019 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Qrox Qrox Qrox left review comments

Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ZhilkinSerg @Qrox