Merge commit '788bc67faa7738cf7c6b2a192ecf3e3567d1c20e' into develop

third_party/libosmium/examples/osmium_area_test.cpp

@@ -132,7 +132,5 @@ int main(int argc, char* argv[]) {
         }
         std::cerr << "\n";
     }
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_convert.cpp

@@ -106,7 +106,6 @@ int main(int argc, char* argv[]) {
         exit_code = 1;
     }
 
-    google::protobuf::ShutdownProtobufLibrary();
     return exit_code;
 }
 

third_party/libosmium/examples/osmium_count.cpp

@@ -7,6 +7,7 @@
 
 */
 
+#include <cstdint>
 #include <iostream>
 
 #include <osmium/io/any_input.hpp>
@@ -15,9 +16,9 @@
 
 struct CountHandler : public osmium::handler::Handler {
 
-    int nodes = 0;
-    int ways = 0;
-    int relations = 0;
+    uint64_t nodes = 0;
+    uint64_t ways = 0;
+    uint64_t relations = 0;
 
     void node(osmium::Node&) {
         ++nodes;
@@ -51,7 +52,5 @@ int main(int argc, char* argv[]) {
     std::cout << "Nodes: "     << handler.nodes << "\n";
     std::cout << "Ways: "      << handler.ways << "\n";
     std::cout << "Relations: " << handler.relations << "\n";
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_create_node_cache.cpp

@@ -12,8 +12,7 @@
 #include <fcntl.h>
 #include <iostream>
 
-#include <osmium/io/pbf_input.hpp>
-#include <osmium/io/xml_input.hpp>
+#include <osmium/io/any_input.hpp>
 
 #include <osmium/index/map/dummy.hpp>
 #include <osmium/index/map/dense_mmap_array.hpp>
@@ -51,8 +50,6 @@ int main(int argc, char* argv[]) {
     osmium::apply(reader, location_handler);
     reader.close();
 
-    google::protobuf::ShutdownProtobufLibrary();
-
     return 0;
 }
 

third_party/libosmium/examples/osmium_debug.cpp

@@ -46,7 +46,5 @@ int main(int argc, char* argv[]) {
     }
 
     reader.close();
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_read.cpp

@@ -26,7 +26,5 @@ int main(int argc, char* argv[]) {
     }
 
     reader.close();
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_serdump.cpp

@@ -19,8 +19,7 @@
 # include <direct.h>
 #endif
 
-#include <osmium/io/pbf_input.hpp>
-#include <osmium/io/xml_input.hpp>
+#include <osmium/io/any_input.hpp>
 #include <osmium/handler/disk_store.hpp>
 #include <osmium/handler/object_relations.hpp>
 
@@ -203,7 +202,5 @@ int main(int argc, char* argv[]) {
         map_relation2relation.dump_as_list(fd);
         close(fd);
     }
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_toogr.cpp

@@ -234,8 +234,6 @@ int main(int argc, char* argv[]) {
     osmium::apply(reader, location_handler, ogr_handler);
     reader.close();
 
-    google::protobuf::ShutdownProtobufLibrary();
-
     int locations_fd = open("locations.dump", O_WRONLY | O_CREAT, 0644);
     if (locations_fd < 0) {
         throw std::system_error(errno, std::system_category(), "Open failed");

third_party/libosmium/examples/osmium_toogr2.cpp

@@ -327,7 +327,5 @@ int main(int argc, char* argv[]) {
         }
         std::cerr << "\n";
     }
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_toogr2_exp.cpp

@@ -301,7 +301,5 @@ int main(int argc, char* argv[]) {
         }
         std::cerr << "\n";
     }
-
-    google::protobuf::ShutdownProtobufLibrary();
 }
 

third_party/libosmium/examples/osmium_use_node_cache.cpp

@@ -12,8 +12,7 @@
 #include <fcntl.h>
 #include <iostream>
 
-#include <osmium/io/pbf_input.hpp>
-#include <osmium/io/xml_input.hpp>
+#include <osmium/io/any_input.hpp>
 
 #include <osmium/index/map/dummy.hpp>
 #include <osmium/index/map/dense_file_array.hpp>
@@ -64,8 +63,6 @@ int main(int argc, char* argv[]) {
     osmium::apply(reader, location_handler, handler);
     reader.close();
 
-    google::protobuf::ShutdownProtobufLibrary();
-
     return 0;
 }