JDBtracker
/
libcubescript
forked from OctaForge/libcubescript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build

master
Daniel Kolesa 2017-02-13 23:32:15 +01:00
parent 41eb8b211f
commit efe4ee523a
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/cubescript/cubescript.hh
View File

@ -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<R>(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;
}

6
src/lib_list.cc
View File

@ -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(' ');
}