commit 10346b59150a7e14973b226a6333fcd1847750d5
Author: Tom Hughes <tom@compton.nu>
Date: Thu Jan 18 18:58:11 2024 +0000
Boost 1.83
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index 0c4662304..b81a742c7 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -32,6 +32,7 @@
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp>
#include <boost/fusion/include/std_pair.hpp>
+#include <boost/regex/pending/unicode_iterator.hpp>
#pragma GCC diagnostic pop
#include <vector>
diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index 916b17e01..ef3b1cdff 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -40,6 +40,8 @@
#include <cstdio>
#include <algorithm>
+#include <boost/algorithm/string.hpp>
+
namespace csv_utils {
namespace detail {
@@ -377,7 +379,7 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
if (record_size <= 10)
{
std::string trimmed = csv_line;
- boost::trim_if(trimmed, boost::algorithm::is_any_of("\",'\r\n "));
+ boost::algorithm::trim_if(trimmed, boost::algorithm::is_any_of("\",'\r\n "));
if (trimmed.empty())
{
MAPNIK_LOG_DEBUG(csv) << "csv_datasource: empty row encountered at line: " << line_number;