Replace infix_ostream_iterator by fmt::join

zerebubuth · Jan 3, 2024 · 54a2c2e · 54a2c2e
1 parent 6fca95c
commit 54a2c2e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 82 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -14,7 +14,6 @@ cgimap_include_HEADERS = \
 	include/cgimap/data_update.hpp \
 	include/cgimap/handler.hpp \
 	include/cgimap/http.hpp \
-	include/cgimap/infix_ostream_iterator.hpp \
 	include/cgimap/logger.hpp \
 	include/cgimap/mime_types.hpp \
 	include/cgimap/basicauth.hpp \

diff --git a/include/cgimap/backend/apidb/pqxx_string_traits.hpp b/include/cgimap/backend/apidb/pqxx_string_traits.hpp
@@ -14,10 +14,13 @@
 #include <set>
 #include <sstream>
 #include <vector>
+
+#include <fmt/core.h>
+#include <fmt/format.h>
+
 #include <pqxx/pqxx>
 
 #include "cgimap/types.hpp"
-#include "cgimap/infix_ostream_iterator.hpp"
 
 namespace pqxx {
 
@@ -43,12 +46,7 @@ namespace pqxx {
     }                                                                   \
     static void from_string(const char[], type &) {}                    \
     static std::string to_string(const type &ids) {                     \
-      std::stringstream ostr;                                           \
-      ostr << "{";                                                      \
-      std::copy(ids.begin(), ids.end(),                                 \
-                infix_ostream_iterator<type::value_type>(ostr, ","));   \
-      ostr << "}";                                                      \
-      return ostr.str();                                                \
+      return fmt::format("{{{}}}", fmt::join(ids, ","));                \
     }                                                                   \
   }
 

diff --git a/include/cgimap/infix_ostream_iterator.hpp b/include/cgimap/infix_ostream_iterator.hpp
diff --git a/include/cgimap/util.hpp b/include/cgimap/util.hpp
@@ -10,7 +10,6 @@
 #ifndef UTIL_HPP
 #define UTIL_HPP
 
-#include "infix_ostream_iterator.hpp"
 #include "cgimap/http.hpp"
 #include "cgimap/logger.hpp"
 #include "cgimap/options.hpp"
@@ -26,6 +25,8 @@
 #include <string>
 #include <type_traits>
 
+#include <fmt/core.h>
+#include <fmt/format.h>
 
 
 inline size_t unicode_strlen(const std::string & s)
@@ -78,10 +79,7 @@ inline std::string friendly_name(const std::string & input)
 
 template <typename T>
 inline std::string to_string(const std::set<T> &ids) {
-  std::stringstream ostr;
-  std::copy(ids.begin(), ids.end(),
-            infix_ostream_iterator<T>(ostr, ","));
-  return ostr.str();
+  return fmt::format("{}", fmt::join(ids, ","));
 }
 
 

diff --git a/src/backend/apidb/readonly_pgsql_selection.cpp b/src/backend/apidb/readonly_pgsql_selection.cpp
@@ -15,7 +15,6 @@
 #include "cgimap/logger.hpp"
 #include "cgimap/options.hpp"
 #include "cgimap/backend/apidb/quad_tile.hpp"
-#include "cgimap/infix_ostream_iterator.hpp"
 
 #include <functional>
 #include <set>