MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-29 12:18:54 +02:00
Code Issues Releases Wiki Activity

ircd::json: Minor conflict fix.

Browse source
This commit is contained in:
Jason Volk 2017-10-05 19:46:38 -07:00
parent 15b67799b3
commit 638f5469c5
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ircd/json.cc
View file

@ -51,7 +51,6 @@ namespace ircd::json
using karma::double_;
using karma::bool_;
using karma::maxwidth;
using karma::buffer;
using karma::eps;
using karma::attr_cast;
@ -716,7 +715,7 @@ ircd::json::array::stringify(mutable_buffer &buf,
{
[](mutable_buffer &buf, const string_view &element)
{
if(!consume(buf, buffer::copy(buf, element)))
if(!consume(buf, ircd::buffer::copy(buf, element)))
throw print_error("The JSON generator ran out of space in supplied buffer");
}
};