Merge pull request zerebubuth#389 from Woazboat/emplace-back-instead-of-push-back

Use emplace_back instead of push_back, remove unnecessary temp objects

Author: mmd-osm

src/api06/nodes_handler.cpp

@@ -29,7 +29,7 @@ nodes_responder::nodes_responder(mime::type mt, const vector<id_version> &ids,
 
   for (const auto &idv : ids) {
     if (idv.version) {
-      historic_ids.push_back(std::make_pair(idv.id, *idv.version));
+      historic_ids.emplace_back(idv.id, *idv.version);
     } else {
       current_ids.push_back(idv.id);
     }

src/api06/relations_handler.cpp

@@ -33,7 +33,7 @@ relations_responder::relations_responder(mime::type mt, const vector<id_version>
 
   for (id_version idv : ids) {
     if (idv.version) {
-      historic_ids.push_back(std::make_pair(idv.id, *idv.version));
+      historic_ids.emplace_back(idv.id, *idv.version);
     } else {
       current_ids.push_back(idv.id);
     }

src/api06/ways_handler.cpp

@@ -26,7 +26,7 @@ ways_responder::ways_responder(mime::type mt, const std::vector<id_version>& ids
 
   for (id_version idv : ids) {
     if (idv.version) {
-      historic_ids.push_back(std::make_pair(idv.id, *idv.version));
+      historic_ids.emplace_back(idv.id, *idv.version);
     } else {
       current_ids.push_back(idv.id);
     }

src/backend.cpp

@@ -24,7 +24,7 @@ po::variables_map first_pass_argments(int argc, char *argv[],
   // them
   std::vector<std::string> args;
   for (int i = 1; i < argc; ++i) {
-    args.push_back(argv[i]);
+    args.emplace_back(argv[i]);
   }
 
   po::variables_map vm;

src/backend/apidb/changeset_upload/relation_updater.cpp

@@ -45,8 +45,7 @@ void ApiDB_Relation_Updater::add_relation(osm_changeset_id_t changeset_id,
   new_relation.old_id = old_id;
 
   for (const auto &tag : tags)
-    new_relation.tags.emplace_back(
-        std::pair<std::string, std::string>(tag.first, tag.second));
+    new_relation.tags.emplace_back(tag.first, tag.second);
 
   osm_sequence_id_t member_seq = 0;
   for (const auto &member : members) {
@@ -80,8 +79,7 @@ void ApiDB_Relation_Updater::modify_relation(osm_changeset_id_t changeset_id,
   modify_relation.changeset_id = changeset_id;
 
   for (const auto &tag : tags)
-    modify_relation.tags.emplace_back(
-        std::pair<std::string, std::string>(tag.first, tag.second));
+    modify_relation.tags.emplace_back(tag.first, tag.second);
 
   osm_sequence_id_t member_seq = 0;
   for (const auto &member : members) {
@@ -559,7 +557,7 @@ ApiDB_Relation_Updater::build_packages(
       ++id_to_package[relation.id];
 
     if (id_to_package[relation.id] + 1 > result.size())
-      result.emplace_back(std::vector<ApiDB_Relation_Updater::relation_t>());
+      result.emplace_back();
 
     result.at(id_to_package[relation.id]).emplace_back(relation);
   }

src/backend/apidb/changeset_upload/way_updater.cpp

@@ -46,8 +46,7 @@ void ApiDB_Way_Updater::add_way(osm_changeset_id_t changeset_id,
   new_way.old_id = old_id;
 
   for (const auto &tag : tags)
-    new_way.tags.push_back(
-        std::pair<std::string, std::string>(tag.first, tag.second));
+    new_way.tags.emplace_back(tag.first, tag.second);
 
   // If the following conditions are still not met, although our XML parser
   // raised an exception for it, it's clearly a programming error.
@@ -78,8 +77,7 @@ void ApiDB_Way_Updater::modify_way(osm_changeset_id_t changeset_id,
   modify_way.changeset_id = changeset_id;
 
   for (const auto &tag : tags)
-    modify_way.tags.push_back(
-        std::pair<std::string, std::string>(tag.first, tag.second));
+    modify_way.tags.emplace_back(tag.first, tag.second);
 
   // If the following conditions are still not met, although our XML parser
   // raised an exception for it, it's clearly a programming error.
@@ -460,7 +458,7 @@ ApiDB_Way_Updater::build_packages(const std::vector<way_t> &ways) {
       ++id_to_package[way.id];
 
     if (id_to_package[way.id] + 1 > result.size())
-      result.emplace_back(std::vector<ApiDB_Way_Updater::way_t>());
+      result.emplace_back();
 
     result.at(id_to_package[way.id]).emplace_back(way);
   }

src/backend/apidb/common_pgsql_selection.cpp

@@ -208,8 +208,8 @@ std::optional<T> extract_optional(const pqxx_field &f) {
 
   tags.reserve(keys.size());
 
-  for(std::size_t i=0; i<keys.size(); i++)
-     tags.push_back(std::make_pair(keys[i], values[i]));
+  for (std::size_t i = 0; i < keys.size(); i++)
+    tags.emplace_back(keys[i], values[i]);
 
   return tags;
 }