Various include fixes

joto · joto · commit 3725ba0f7f5a · 2025-01-09T12:02:07.000+01:00
diff --git a/benchmarks/osmium_benchmark_count.cpp b/benchmarks/osmium_benchmark_count.cpp
@@ -10,6 +10,7 @@
 
 #include <cstdint>
 #include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <string>
 
diff --git a/benchmarks/osmium_benchmark_count_tag.cpp b/benchmarks/osmium_benchmark_count_tag.cpp
@@ -10,6 +10,7 @@
 
 #include <cstdint>
 #include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <string>
 
diff --git a/benchmarks/osmium_benchmark_index_map.cpp b/benchmarks/osmium_benchmark_index_map.cpp
@@ -4,14 +4,15 @@
 
 */
 
-#include <osmium/handler.hpp>
 #include <osmium/handler/node_locations_for_ways.hpp>
 #include <osmium/index/map/all.hpp>
 #include <osmium/io/any_input.hpp>
 #include <osmium/visitor.hpp>
 
 #include <cstdlib>
+#include <exception>
 #include <iostream>
+#include <memory>
 #include <string>
 
 using index_type = osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>;
diff --git a/benchmarks/osmium_benchmark_mercator.cpp b/benchmarks/osmium_benchmark_mercator.cpp
@@ -10,8 +10,8 @@
 #include <osmium/io/any_input.hpp>
 #include <osmium/visitor.hpp>
 
-#include <cstdint>
 #include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <string>
 
diff --git a/benchmarks/osmium_benchmark_static_vs_dynamic_index.cpp b/benchmarks/osmium_benchmark_static_vs_dynamic_index.cpp
@@ -16,7 +16,6 @@
 
 */
 
-#include <osmium/handler.hpp>
 #include <osmium/handler/node_locations_for_ways.hpp>
 #include <osmium/index/map/all.hpp>
 #include <osmium/io/any_input.hpp>
@@ -26,8 +25,11 @@
 #include <chrono>
 #include <cmath>
 #include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <limits>
+#include <memory>
+#include <ratio>
 #include <string>
 
 using static_index_type = osmium::index::map::SparseMemArray<osmium::unsigned_object_id_type, osmium::Location>;
diff --git a/benchmarks/osmium_benchmark_write_pbf.cpp b/benchmarks/osmium_benchmark_write_pbf.cpp
@@ -4,12 +4,14 @@
 
 */
 
+#include <osmium/io/any_input.hpp>
+#include <osmium/io/any_output.hpp>
+
 #include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <string>
-
-#include <osmium/io/any_input.hpp>
-#include <osmium/io/any_output.hpp>
+#include <utility>
 
 int main(int argc, char* argv[]) {
     if (argc != 3) {
diff --git a/examples/osmium_amenity_list.cpp b/examples/osmium_amenity_list.cpp
@@ -25,6 +25,7 @@
 */
 
 #include <cstdio>   // for std::printf
+#include <exception>
 #include <iostream> // for std::cerr
 #include <string>   // for std::string
 
diff --git a/examples/osmium_area_test.cpp b/examples/osmium_area_test.cpp
@@ -26,7 +26,9 @@
 */
 
 #include <cstring>  // for std::strcmp
+#include <exception>
 #include <iostream> // for std::cout, std::cerr
+#include <vector>
 
 // For assembling multipolygons
 #include <osmium/area/assembler.hpp>
diff --git a/examples/osmium_convert.cpp b/examples/osmium_convert.cpp
@@ -21,6 +21,7 @@
 #include <exception> // for std::exception
 #include <iostream>  // for std::cout, std::cerr
 #include <string>    // for std::string
+#include <utility>
 
 // Allow any format of input files (XML, PBF, ...)
 #include <osmium/io/any_input.hpp>
diff --git a/examples/osmium_count.cpp b/examples/osmium_count.cpp
@@ -18,6 +18,7 @@
 */
 
 #include <cstdint>  // for std::uint64_t
+#include <exception>
 #include <iostream> // for std::cout, std::cerr
 
 // Allow any format of input files (XML, PBF, ...)
diff --git a/examples/osmium_debug.cpp b/examples/osmium_debug.cpp
@@ -17,6 +17,7 @@
 
 */
 
+#include <exception>
 #include <iostream> // for std::cout, std::cerr
 #include <string>   // for std::string
 
diff --git a/examples/osmium_dump_internal.cpp b/examples/osmium_dump_internal.cpp
@@ -30,8 +30,10 @@
 
 #include <cerrno>      // for errno
 #include <cstring>     // for std::strerror
+#include <exception>
 #include <iostream>    // for std::cout, std::cerr
 #include <string>      // for std::string
+#include <system_error>
 #include <sys/stat.h>  // for open
 #include <sys/types.h> // for open
 
diff --git a/examples/osmium_filter_discussions.cpp b/examples/osmium_filter_discussions.cpp
@@ -22,6 +22,7 @@
 */
 
 #include <algorithm> // for std::copy_if
+#include <exception>
 #include <iostream>  // for std::cout, std::cerr
 
 // We want to read OSM files in XML format
diff --git a/examples/osmium_index_lookup.cpp b/examples/osmium_index_lookup.cpp
@@ -25,12 +25,11 @@
 #include <algorithm>   // for std::all_of, std::equal_range
 #include <cstdlib>     // for std::exit
 #include <cstring>     // for std::strcmp
+#include <exception>
 #include <fcntl.h>     // for open
 #include <iostream>    // for std::cout, std::cerr
 #include <memory>      // for std::unique_ptr
 #include <string>      // for std::string
-#include <sys/stat.h>  // for open
-#include <sys/types.h> // for open
 #include <vector>      // for std::vector
 
 #ifdef _WIN32
diff --git a/examples/osmium_location_cache_create.cpp b/examples/osmium_location_cache_create.cpp
@@ -26,6 +26,7 @@
 
 #include <cerrno>      // for errno
 #include <cstring>     // for strerror
+#include <exception>
 #include <fcntl.h>     // for open
 #include <iostream>    // for std::cout, std::cerr
 #include <string>      // for std::string
diff --git a/examples/osmium_location_cache_use.cpp b/examples/osmium_location_cache_use.cpp
@@ -26,6 +26,7 @@
 
 #include <cerrno>      // for errno
 #include <cstring>     // for strerror
+#include <exception>
 #include <fcntl.h>     // for open
 #include <iostream>    // for std::cout, std::cerr
 #include <string>      // for std::string
diff --git a/examples/osmium_pub_names.cpp b/examples/osmium_pub_names.cpp
@@ -19,6 +19,7 @@
 */
 
 #include <cstring>  // for std::strncmp
+#include <exception>
 #include <iostream> // for std::cout, std::cerr
 
 // Allow any format of input files (XML, PBF, ...)
diff --git a/examples/osmium_read.cpp b/examples/osmium_read.cpp
@@ -13,6 +13,7 @@
 
 */
 
+#include <exception>
 #include <iostream> // for std::cerr
 
 // Allow any format of input files (XML, PBF, ...)
diff --git a/examples/osmium_read_with_progress.cpp b/examples/osmium_read_with_progress.cpp
@@ -16,6 +16,7 @@
 
 */
 
+#include <exception>
 #include <iostream> // for std::cerr
 
 // Allow any format of input files (XML, PBF, ...)
diff --git a/examples/osmium_road_length.cpp b/examples/osmium_road_length.cpp
@@ -20,6 +20,7 @@
 
 */
 
+#include <exception>
 #include <iostream> // for std::cout, std::cerr
 
 // Allow any format of input files (XML, PBF, ...)
diff --git a/test/data-tests/testdata-multipolygon.cpp b/test/data-tests/testdata-multipolygon.cpp
@@ -13,6 +13,7 @@
 #include <gdalcpp.hpp>
 
 #include <cstring>
+#include <exception>
 #include <fstream>
 #include <iostream>
 #include <map>
diff --git a/test/data-tests/testdata-overview.cpp b/test/data-tests/testdata-overview.cpp
@@ -9,6 +9,7 @@
 
 #include <gdalcpp.hpp>
 
+#include <exception>
 #include <iostream>
 #include <string>
 
diff --git a/test/data-tests/testdata-testcases.cpp b/test/data-tests/testdata-testcases.cpp
@@ -3,6 +3,7 @@
 
 #include "testdata-testcases.hpp"
 
+#include <exception>
 #include <iostream>
 #include <string>
 
diff --git a/test/data-tests/testdata-xml.cpp b/test/data-tests/testdata-xml.cpp
@@ -7,15 +7,16 @@
 #include <osmium/io/gzip_compression.hpp>
 #include <osmium/io/xml_input.hpp>
 #include <osmium/util/misc.hpp>
-#include <osmium/visitor.hpp>
 
+#include <atomic>
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
 #include <future>
-#include <iostream>
 #include <iterator>
+#include <stdexcept>
 #include <string>
+#include <utility>
 
 namespace {
 
diff --git a/test/t/geom/test_ogr_wkb.cpp b/test/t/geom/test_ogr_wkb.cpp
@@ -5,7 +5,6 @@
 #include <osmium/util/endian.hpp>
 
 #include <memory>
-#include <sstream>
 #include <string>
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/test/t/index/test_dump_and_load_index.cpp b/test/t/index/test_dump_and_load_index.cpp
@@ -10,6 +10,8 @@
 #include <osmium/osm/location.hpp>
 #include <osmium/osm/types.hpp>
 
+#include <functional>
+
 using dense_file_array = osmium::index::map::DenseFileArray<osmium::unsigned_object_id_type, osmium::Location>;
 using sparse_file_array = osmium::index::map::SparseFileArray<osmium::unsigned_object_id_type, osmium::Location>;
 
diff --git a/test/t/index/test_dump_sparse_as_array.cpp b/test/t/index/test_dump_sparse_as_array.cpp
@@ -9,6 +9,7 @@
 #include <osmium/osm/types.hpp>
 #include <osmium/util/file.hpp>
 
+#include <algorithm>
 #include <vector>
 
 using dense_file_array = osmium::index::map::DenseFileArray<osmium::unsigned_object_id_type, osmium::Location>;
diff --git a/test/t/index/test_id_set.cpp b/test/t/index/test_id_set.cpp
@@ -3,6 +3,8 @@
 #include <osmium/index/id_set.hpp>
 #include <osmium/osm/types.hpp>
 
+#include <algorithm>
+
 TEST_CASE("Basic functionality of IdSetDense") {
     osmium::index::IdSetDense<osmium::unsigned_object_id_type> s;
 
diff --git a/test/t/io/test_gzip.cpp b/test/t/io/test_gzip.cpp
@@ -6,6 +6,7 @@
 #include <osmium/io/gzip_compression.hpp>
 
 #include <string>
+#include <system_error>
 
 TEST_CASE("Invalid file descriptor of gzip-compressed file") {
     REQUIRE_THROWS_AS(osmium::io::GzipDecompressor{-1}, osmium::gzip_error);
diff --git a/test/t/io/test_nocompression.cpp b/test/t/io/test_nocompression.cpp
@@ -5,6 +5,7 @@
 #include <osmium/io/compression.hpp>
 
 #include <string>
+#include <system_error>
 
 TEST_CASE("Invalid file descriptor of uncompressed file") {
     osmium::io::NoDecompressor decomp{-1};
diff --git a/test/t/io/test_opl_parser.cpp b/test/t/io/test_opl_parser.cpp
@@ -10,6 +10,7 @@
 #include <cstring>
 #include <initializer_list>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace oid = osmium::io::detail;
diff --git a/test/t/io/test_output_utils.cpp b/test/t/io/test_output_utils.cpp
@@ -2,6 +2,8 @@
 
 #include <osmium/io/detail/string_util.hpp>
 
+#include <cctype>
+#include <cstring>
 #include <iterator>
 #include <locale>
 #include <stdexcept>
diff --git a/test/t/io/test_reader.cpp b/test/t/io/test_reader.cpp
@@ -8,6 +8,7 @@
 #include <osmium/memory/buffer.hpp>
 #include <osmium/visitor.hpp>
 
+#include <array>
 #include <iterator>
 #include <stdexcept>
 #include <vector>
diff --git a/test/t/io/test_reader_with_mock_parser.cpp b/test/t/io/test_reader_with_mock_parser.cpp
@@ -6,7 +6,6 @@
 #include <osmium/builder/osm_object_builder.hpp>
 #include <osmium/io/compression.hpp>
 #include <osmium/io/detail/input_format.hpp>
-#include <osmium/io/detail/queue_util.hpp>
 #include <osmium/io/file_format.hpp>
 #include <osmium/io/header.hpp>
 #include <osmium/io/reader.hpp>
diff --git a/test/t/osm/test_changeset.cpp b/test/t/osm/test_changeset.cpp
@@ -6,6 +6,7 @@
 #include <osmium/osm/changeset.hpp>
 #include <osmium/osm/crc.hpp>
 
+#include <ctime>
 #include <string>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
diff --git a/test/t/osm/test_location.cpp b/test/t/osm/test_location.cpp
@@ -9,7 +9,6 @@
 #include <limits>
 #include <sstream>
 #include <string>
-#include <type_traits>
 
 // fails on MSVC and doesn't really matter
 // static_assert(std::is_literal_type<osmium::Location>::value, "osmium::Location not literal type");
diff --git a/test/t/osm/test_node.cpp b/test/t/osm/test_node.cpp
@@ -6,6 +6,7 @@
 #include <osmium/osm/crc.hpp>
 #include <osmium/osm/node.hpp>
 
+#include <ctime>
 #include <string>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
diff --git a/test/t/osm/test_relation.cpp b/test/t/osm/test_relation.cpp
@@ -7,6 +7,7 @@
 #include <osmium/osm/relation.hpp>
 
 #include <cstdint>
+#include <ctime>
 #include <string>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
diff --git a/test/t/osm/test_way.cpp b/test/t/osm/test_way.cpp
@@ -7,6 +7,7 @@
 #include <osmium/osm/crc.hpp>
 #include <osmium/osm/way.hpp>
 
+#include <ctime>
 #include <string>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
diff --git a/test/t/tags/test_tag_list.cpp b/test/t/tags/test_tag_list.cpp
@@ -4,6 +4,7 @@
 #include <osmium/memory/buffer.hpp>
 #include <osmium/osm/tag.hpp>
 
+#include <cstring>
 #include <map>
 #include <string>
 #include <utility>
@@ -62,7 +63,7 @@ TEST_CASE("create tag list") {
     SECTION("with TagListBuilder from char* with length") {
         {
             osmium::builder::TagListBuilder builder(buffer);
-            builder.add_tag("highway", strlen("highway"), "primary", strlen("primary"));
+            builder.add_tag("highway", std::strlen("highway"), "primary", std::strlen("primary"));
             builder.add_tag("nameXX", 4, "Main Street", 11);
         }
         buffer.commit();
