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

Deployed a few more cases of vector::emplace_back and deque::emplace_back

Browse source
This commit is contained in:
Charles Dang 2017-05-22 13:12:32 +11:00
parent a40f0d248e
commit 2f4f0d03c5
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_initialization/lobby_data.cpp
View file

@ -61,7 +61,7 @@ void chat_session::add_message(const time_t& timestamp,
const std::string& user,
const std::string& message)
{
history_.push_back(chat_message(timestamp, user, message));
history_.emplace_back(timestamp, user, message);
}

4
src/game_initialization/lobby_info.cpp
View file

@ -219,7 +219,7 @@ void lobby_info::process_userlist()
SCOPE_LB;
users_.clear();
for(const auto & c : gamelist_.child_range("user")) {
users_.push_back(user_info(c));
users_.emplace_back(c);
}
for(auto & ui : users_) {
@ -323,7 +323,7 @@ chat_session& lobby_info::get_whisper_log(const std::string& name)
void lobby_info::open_room(const std::string& name)
{
if(!has_room(name)) {
rooms_.push_back(room_info(name));
rooms_.emplace_back(name);
}
}

2
src/generators/default_map_generator_job.cpp
View file

@ -753,7 +753,7 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
std::vector<terrain_height_mapper> height_conversion;
for(const config& h : cfg.child_range("height")) {
height_conversion.push_back(terrain_height_mapper(h));
height_conversion.emplace_back(h);
}
terrain_map terrain(data.width, data.height, grassland);

11
src/statistics.cpp
View file

@ -97,7 +97,7 @@ std::vector<scenario_stats> master_stats;
static stats &get_stats(const std::string &save_id)
{
if(master_stats.empty()) {
master_stats.push_back(scenario_stats(std::string()));
master_stats.emplace_back(std::string());
}
team_stats_t& team_stats = master_stats.back().team_stats;
@ -396,7 +396,7 @@ void stats::read(const config& cfg)
scenario_context::scenario_context(const std::string& name)
{
if(!mid_scenario || master_stats.empty()) {
master_stats.push_back(scenario_stats(name));
master_stats.emplace_back(name);
}
mid_scenario = true;
@ -592,14 +592,13 @@ levels level_stats(const std::string & save_id)
team_stats_t::const_iterator find_it = team_stats.find(save_id);
if ( find_it != team_stats.end() )
level_list.push_back(make_pair(&master_stats[level].scenario_name,
&find_it->second));
level_list.emplace_back(&master_stats[level].scenario_name, &find_it->second);
}
// Make sure we do return something (so other code does not have to deal
// with an empty list).
if ( level_list.empty() )
level_list.push_back(make_pair(&null_name, &null_stats));
level_list.emplace_back(&null_name, &null_stats);
return level_list;
}
@ -634,7 +633,7 @@ void read_stats(const config& cfg)
mid_scenario = cfg["mid_scenario"].to_bool();
for(const config &s : cfg.child_range("scenario")) {
master_stats.push_back(scenario_stats(s));
master_stats.emplace_back(s);
}
}