From efe4ee523a4bfb0a46f345cea303445b63c0bba3 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 13 Feb 2017 23:32:15 +0100 Subject: [PATCH] fix build --- include/cubescript/cubescript.hh | 16 ++++++++-------- src/lib_list.cc | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/cubescript/cubescript.hh b/include/cubescript/cubescript.hh index 4d48acf0..85d49feb 100644 --- a/include/cubescript/cubescript.hh +++ b/include/cubescript/cubescript.hh @@ -588,19 +588,19 @@ namespace util { for (; !str.empty(); str.pop_front()) { switch (str.front()) { case '\n': - ret += writer.put_n("^n", 2); + ret += ostd::range_put_n(writer, "^n", 2); break; case '\t': - ret += writer.put_n("^t", 2); + ret += ostd::range_put_n(writer, "^t", 2); break; case '\f': - ret += writer.put_n("^f", 2); + ret += ostd::range_put_n(writer, "^f", 2); break; case '"': - ret += writer.put_n("^\"", 2); + ret += ostd::range_put_n(writer, "^\"", 2); break; case '^': - ret += writer.put_n("^^", 2); + ret += ostd::range_put_n(writer, "^^", 2); break; default: ret += writer.put(str.front()); @@ -690,7 +690,7 @@ namespace util { if (!p_quote.empty() && (*p_quote == '"')) { return unescape_string(std::forward(writer), p_item); } else { - return writer.put_n(p_item.data(), p_item.size()); + return ostd::range_put_n(writer, p_item.data(), p_item.size()); } } @@ -771,7 +771,7 @@ private: case cs_value_type::Cstring: case cs_value_type::Macro: { auto sv = vals[i].get_strr(); - ret += writer.put_n(sv.data(), sv.size()); + ret += ostd::range_put_n(writer, sv.data(), sv.size()); break; } default: @@ -780,7 +780,7 @@ private: if (i == (vals.size() - 1)) { break; } - ret += writer.put_n(sep.data(), sep.size()); + ret += ostd::range_put_n(writer, sep.data(), sep.size()); } return ret; } diff --git a/src/lib_list.cc b/src/lib_list.cc index 6f895fc3..ade8f08b 100644 --- a/src/lib_list.cc +++ b/src/lib_list.cc @@ -431,7 +431,9 @@ end: (p.get_raw_item(true).front() == '"')) { util::unescape_string(buf, p.get_raw_item()); } else { - buf.put_n(p.get_raw_item().data(), p.get_raw_item().size()); + ostd::range_put_n( + buf, p.get_raw_item().data(), p.get_raw_item().size() + ); } if ((n + 1) < len) { if ((len > 2) || conj.empty()) { @@ -439,7 +441,7 @@ end: } if ((n + 2 == len) && !conj.empty()) { buf.put(' '); - buf.put_n(conj.data(), conj.size()); + ostd::range_put_n(buf, conj.data(), conj.size()); } buf.put(' '); }