0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the build

Browse source 
Explicitly use t_str() to avoid an ambiguous construction from
7bee8ee157, which made GCC9 error out because it
could alternatively use t_string::t_string(const string &).

Resolve the merge conflict from 26d1ca7a7d
This commit is contained in:
Steve Cotton 2019-09-15 22:46:10 +02:00
parent a090a0ff78
commit af91654e26
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/schema/units/types.cfg
View file

@ -67,10 +67,7 @@
[/tag]
[tag]
name="special_note"
<<<<<<< HEAD
max="infinite"
=======
>>>>>>> special_notes
{REQUIRED_KEY note t_string}
[/tag]
{LINK_TAG "units/movetype/resistance"}

4
src/units/unit.cpp
View file

@ -620,7 +620,7 @@ void unit::init(const config& cfg, bool use_traits, const vconfig* vcfg)
set_attr_changed(UA_NOTES);
special_notes_.clear();
for(const config& c : cfg_range) {
special_notes_.emplace_back(c["note"]);
special_notes_.emplace_back(c["note"].t_str());
}
}
@ -1941,7 +1941,7 @@ void unit::apply_builtin_effect(std::string apply_to, const config& effect)
if(config::const_child_itors cfg_range = effect.child_range("add_special_note")) {
for(const config& c : cfg_range) {
special_notes_.emplace_back(c["note"]);
special_notes_.emplace_back(c["note"].t_str());
}
}