Remove redundant member initialization

joto · joto · commit 2f8e9717282d · 2024-12-17T14:16:17.000+01:00
diff --git a/include/osmium/area/detail/basic_assembler.hpp b/include/osmium/area/detail/basic_assembler.hpp
@@ -70,7 +70,7 @@ namespace osmium {
 
             struct location_to_ring_map {
                 osmium::Location location;
-                open_ring_its_type::iterator ring_it{};
+                open_ring_its_type::iterator ring_it;
                 bool start{false};
 
                 location_to_ring_map(osmium::Location l, open_ring_its_type::iterator r, const bool s) noexcept :
@@ -703,7 +703,7 @@ namespace osmium {
 
                 struct candidate {
                     int64_t sum;
-                    std::vector<std::pair<location_to_ring_map, bool>> rings{};
+                    std::vector<std::pair<location_to_ring_map, bool>> rings;
                     osmium::Location start_location;
                     osmium::Location stop_location;
 
diff --git a/include/osmium/area/detail/node_ref_segment.hpp b/include/osmium/area/detail/node_ref_segment.hpp
@@ -75,10 +75,10 @@ namespace osmium {
             class NodeRefSegment {
 
                 // First node in order described above.
-                osmium::NodeRef m_first{};
+                osmium::NodeRef m_first;
 
                 // Second node in order described above.
-                osmium::NodeRef m_second{};
+                osmium::NodeRef m_second;
 
                 // Way this segment was from.
                 const osmium::Way* m_way = nullptr;
diff --git a/include/osmium/area/detail/proto_ring.hpp b/include/osmium/area/detail/proto_ring.hpp
@@ -64,11 +64,11 @@ namespace osmium {
             private:
 
                 // Segments in this ring.
-                segments_type m_segments{};
+                segments_type m_segments;
 
                 // If this is an outer ring, these point to it's inner rings
                 // (if any).
-                std::vector<ProtoRing*> m_inner{};
+                std::vector<ProtoRing*> m_inner;
 
                 // The smallest segment. Will be kept current whenever a new
                 // segment is added to the ring.
diff --git a/include/osmium/area/detail/segment_list.hpp b/include/osmium/area/detail/segment_list.hpp
@@ -84,7 +84,7 @@ namespace osmium {
 
                 using slist_type = std::vector<NodeRefSegment>;
 
-                slist_type m_segments{};
+                slist_type m_segments;
 
                 bool m_debug;
 
diff --git a/include/osmium/io/detail/o5m_input_format.hpp b/include/osmium/io/detail/o5m_input_format.hpp
@@ -153,9 +153,9 @@ namespace osmium {
 
             class O5mParser final : public ParserWithBuffer {
 
-                osmium::io::Header m_header{};
+                osmium::io::Header m_header;
 
-                std::string m_input{};
+                std::string m_input;
 
                 const char* m_data;
                 const char* m_end;
diff --git a/include/osmium/io/detail/pbf_input_format.hpp b/include/osmium/io/detail/pbf_input_format.hpp
@@ -65,7 +65,7 @@ namespace osmium {
 
             class PBFParser final : public Parser {
 
-                std::string m_input_buffer{};
+                std::string m_input_buffer;
                 std::atomic<std::size_t>* m_offset_ptr;
                 int m_fd;
                 bool m_want_buffered_pages_removed;
diff --git a/include/osmium/io/detail/pbf_output_format.hpp b/include/osmium/io/detail/pbf_output_format.hpp
@@ -275,7 +275,7 @@ namespace osmium {
                 protozero::pbf_builder<OSMFormat::PrimitiveGroup> m_pbf_primitive_group;
                 StringTable m_stringtable;
                 pbf_output_options m_options;
-                std::unique_ptr<DenseNodes> m_dense_nodes{};
+                std::unique_ptr<DenseNodes> m_dense_nodes;
                 OSMFormat::PrimitiveGroup m_type;
                 int m_count = 0;
 
@@ -366,7 +366,7 @@ namespace osmium {
 
             class SerializeBlob {
 
-                std::shared_ptr<PrimitiveBlock> m_block{};
+                std::shared_ptr<PrimitiveBlock> m_block;
 
                 std::string m_msg;
 
@@ -482,7 +482,7 @@ namespace osmium {
 
                 pbf_output_options m_options;
 
-                std::shared_ptr<PrimitiveBlock> m_primitive_block{};
+                std::shared_ptr<PrimitiveBlock> m_primitive_block;
 
                 std::size_t m_bucket_count = StringTable::min_bucket_count;
 
diff --git a/include/osmium/io/detail/xml_input_format.hpp b/include/osmium/io/detail/xml_input_format.hpp
@@ -150,17 +150,17 @@ namespace osmium {
 
                 std::vector<context> m_context_stack;
 
-                osmium::io::Header m_header{};
+                osmium::io::Header m_header;
 
-                std::unique_ptr<osmium::builder::NodeBuilder>                m_node_builder{};
-                std::unique_ptr<osmium::builder::WayBuilder>                 m_way_builder{};
-                std::unique_ptr<osmium::builder::RelationBuilder>            m_relation_builder{};
-                std::unique_ptr<osmium::builder::ChangesetBuilder>           m_changeset_builder{};
-                std::unique_ptr<osmium::builder::ChangesetDiscussionBuilder> m_changeset_discussion_builder{};
+                std::unique_ptr<osmium::builder::NodeBuilder>                m_node_builder;
+                std::unique_ptr<osmium::builder::WayBuilder>                 m_way_builder;
+                std::unique_ptr<osmium::builder::RelationBuilder>            m_relation_builder;
+                std::unique_ptr<osmium::builder::ChangesetBuilder>           m_changeset_builder;
+                std::unique_ptr<osmium::builder::ChangesetDiscussionBuilder> m_changeset_discussion_builder;
 
-                std::unique_ptr<osmium::builder::TagListBuilder>             m_tl_builder{};
-                std::unique_ptr<osmium::builder::WayNodeListBuilder>         m_wnl_builder{};
-                std::unique_ptr<osmium::builder::RelationMemberListBuilder>  m_rml_builder{};
+                std::unique_ptr<osmium::builder::TagListBuilder>             m_tl_builder;
+                std::unique_ptr<osmium::builder::WayNodeListBuilder>         m_wnl_builder;
+                std::unique_ptr<osmium::builder::RelationMemberListBuilder>  m_rml_builder;
 
                 std::string m_comment_text;
 
diff --git a/include/osmium/io/file.hpp b/include/osmium/io/file.hpp
@@ -73,7 +73,7 @@ namespace osmium {
 
         private:
 
-            std::string m_filename{};
+            std::string m_filename;
 
             const char* m_buffer = nullptr;
             size_t m_buffer_size = 0;
diff --git a/include/osmium/io/header.hpp b/include/osmium/io/header.hpp
@@ -68,7 +68,7 @@ namespace osmium {
         class Header : public osmium::Options {
 
             /// Bounding boxes
-            std::vector<osmium::Box> m_boxes{};
+            std::vector<osmium::Box> m_boxes;
 
             /**
              * Are there possibly multiple versions of the same object in
diff --git a/include/osmium/io/reader.hpp b/include/osmium/io/reader.hpp
@@ -92,7 +92,7 @@ namespace osmium {
             // The Reader::read() function reads from a queue of buffers which
             // can contain nested buffers. These nested buffers will be in
             // here, because read() can only return a single unnested buffer.
-            osmium::memory::Buffer m_back_buffers{};
+            osmium::memory::Buffer m_back_buffers;
 
             osmium::io::File m_file;
 
@@ -124,10 +124,10 @@ namespace osmium {
             detail::future_buffer_queue_type m_osmdata_queue;
             detail::queue_wrapper<osmium::memory::Buffer> m_osmdata_queue_wrapper;
 
-            std::future<osmium::io::Header> m_header_future{};
-            osmium::io::Header m_header{};
+            std::future<osmium::io::Header> m_header_future;
+            osmium::io::Header m_header;
 
-            osmium::thread::thread_handler m_thread{};
+            osmium::thread::thread_handler m_thread;
 
             osmium::osm_entity_bits::type m_read_which_entities = osmium::osm_entity_bits::all;
             osmium::io::read_meta m_read_metadata = osmium::io::read_meta::yes;
diff --git a/include/osmium/io/writer.hpp b/include/osmium/io/writer.hpp
@@ -109,15 +109,15 @@ namespace osmium {
 
             std::unique_ptr<osmium::io::detail::OutputFormat> m_output{nullptr};
 
-            osmium::memory::Buffer m_buffer{};
+            osmium::memory::Buffer m_buffer;
 
             osmium::io::Header m_header;
 
             size_t m_buffer_size = default_buffer_size;
 
-            std::future<std::size_t> m_write_future{};
+            std::future<std::size_t> m_write_future;
 
-            osmium::thread::thread_handler m_thread{};
+            osmium::thread::thread_handler m_thread;
 
             // Checking the m_write_future is much more expensive then checking
             // one atomic bool, so we set this bool in the write_thread when
diff --git a/include/osmium/memory/buffer.hpp b/include/osmium/memory/buffer.hpp
@@ -104,7 +104,7 @@ namespace osmium {
         private:
 
             std::unique_ptr<Buffer> m_next_buffer;
-            std::unique_ptr<unsigned char[]> m_memory{};
+            std::unique_ptr<unsigned char[]> m_memory;
             unsigned char* m_data = nullptr;
             std::size_t m_capacity = 0;
             std::size_t m_written = 0;
diff --git a/include/osmium/object_pointer_collection.hpp b/include/osmium/object_pointer_collection.hpp
@@ -90,7 +90,7 @@ namespace osmium {
      */
     class ObjectPointerCollection : public osmium::handler::Handler {
 
-        std::vector<osmium::OSMObject*> m_objects{};
+        std::vector<osmium::OSMObject*> m_objects;
 
     public:
 
diff --git a/include/osmium/osm/box.hpp b/include/osmium/osm/box.hpp
@@ -48,8 +48,8 @@ namespace osmium {
      */
     class Box {
 
-        osmium::Location m_bottom_left{};
-        osmium::Location m_top_right{};
+        osmium::Location m_bottom_left;
+        osmium::Location m_top_right;
 
     public:
 
diff --git a/include/osmium/osm/object.hpp b/include/osmium/osm/object.hpp
@@ -69,7 +69,7 @@ namespace osmium {
         object_id_type      m_id = 0;
         bool                m_deleted : 1;
         object_version_type m_version : 31;
-        osmium::Timestamp   m_timestamp{};
+        osmium::Timestamp   m_timestamp;
         user_id_type        m_uid = 0;
         changeset_id_type   m_changeset = 0;
 
diff --git a/include/osmium/relations/members_database.hpp b/include/osmium/relations/members_database.hpp
@@ -135,7 +135,7 @@ namespace osmium {
                 }
             };
 
-            std::vector<element> m_elements{};
+            std::vector<element> m_elements;
 
         protected:
 
diff --git a/include/osmium/relations/relations_manager.hpp b/include/osmium/relations/relations_manager.hpp
@@ -75,7 +75,7 @@ namespace osmium {
 
             // All relations and members we are interested in will be kept
             // in here.
-            osmium::ItemStash m_stash{};
+            osmium::ItemStash m_stash;
 
             /// Database of all relations we are interested in.
             relations::RelationsDatabase m_relations_db;
@@ -86,7 +86,7 @@ namespace osmium {
             relations::MembersDatabase<osmium::Relation> m_member_relations_db;
 
             /// Output buffer.
-            osmium::memory::CallbackBuffer m_output{};
+            osmium::memory::CallbackBuffer m_output;
 
         public:
 
diff --git a/include/osmium/thread/pool.hpp b/include/osmium/thread/pool.hpp
@@ -120,7 +120,7 @@ namespace osmium {
             }; // class thread_joiner
 
             osmium::thread::Queue<function_wrapper> m_work_queue;
-            std::vector<std::thread> m_threads{};
+            std::vector<std::thread> m_threads;
             thread_joiner m_joiner;
             int m_num_threads;
 
