Merge pull request #1882 from joto/cleanup-int-double-buffer

Cleanup int double buffer

Author: lonvia

src/db-copy-mgr.hpp

@@ -290,13 +290,7 @@ class db_copy_mgr_t
     template <typename T>
     void add_value(T value)
     {
-        m_current->buffer += std::to_string(value);
-    }
-
-    void add_value(double value)
-    {
-        util::double_to_buffer tmp{value};
-        m_current->buffer += tmp.c_str();
+        m_current->buffer += fmt::to_string(value);
     }
 
     void add_value(std::string const &s) { add_value(s.c_str()); }

src/osmtypes.hpp

@@ -189,9 +189,10 @@ class taglist_t
     }
 
     /// Add tag to list without checking for duplicates
-    void add_tag(char const *key, char const *value)
+    template <typename T>
+    void add_tag(char const *key, T&& value)
     {
-        m_tags.emplace_back(key, value);
+        m_tags.emplace_back(key, std::move(value));
     }
 
     /// Add tag to list if there is no tag with that key yet

src/tagtransform-c.cpp

@@ -84,8 +84,7 @@ static void add_z_order(taglist_t *tags, bool *roads)
         z_order -= 100;
     }
 
-    util::integer_to_buffer z{z_order};
-    tags->add_tag("z_order", z.c_str());
+    tags->add_tag("z_order", fmt::to_string(z_order));
 }
 
 c_tagtransform_t::c_tagtransform_t(options_t const *options, export_list exlist)

src/util.hpp

@@ -25,27 +25,6 @@
 
 namespace util {
 
-class integer_to_buffer
-{
-    // This is enough for 64 bit integers
-    static constexpr std::size_t buffer_size = 21;
-
-public:
-    template <typename T>
-    explicit integer_to_buffer(T value)
-    {
-        auto const result =
-            fmt::format_to_n(m_buffer.begin(), buffer_size - 1, "{}", value);
-        assert(result.size < buffer_size);
-        *result.out = '\0';
-    }
-
-    char const *c_str() const noexcept { return m_buffer.data(); }
-
-private:
-    std::array<char, buffer_size> m_buffer{};
-};
-
 class double_to_buffer
 {
     static constexpr std::size_t buffer_size = 32;

tests/test-util.cpp

@@ -16,24 +16,6 @@
 #include <string>
 #include <vector>
 
-TEST_CASE("integer_to_buffer 1", "[NoDB]")
-{
-    util::integer_to_buffer buffer{1};
-    REQUIRE(std::strcmp(buffer.c_str(), "1") == 0);
-}
-
-TEST_CASE("integer_to_buffer max", "[NoDB]")
-{
-    util::integer_to_buffer buffer{std::numeric_limits<osmid_t>::max()};
-    REQUIRE(std::strcmp(buffer.c_str(), "9223372036854775807") == 0);
-}
-
-TEST_CASE("integer_to_buffer min", "[NoDB]")
-{
-    util::integer_to_buffer buffer{std::numeric_limits<osmid_t>::min()};
-    REQUIRE(std::strcmp(buffer.c_str(), "-9223372036854775808") == 0);
-}
-
 TEST_CASE("double_to_buffer 0", "[NoDB]")
 {
     util::double_to_buffer buffer{0.0};