Skip to content

Commit

Permalink
Merge branch '1.3-prerelease'
Browse files Browse the repository at this point in the history
  • Loading branch information
mtmorgan committed Apr 17, 2024
2 parents 2c442a5 + e117ee1 commit 72a80a8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Authors@R: c(
))
Description: Functions to query (filter or transform), pivot (convert
from array-of-objects to object-of-arrays, for easy import as 'R'
data frame), search, patch (edit), and validate (against 'JSON
Schema') 'JSON' and 'NDJSON' strings, files, or URLs. Query and
data frame), search, patch (edit), and validate (against 'JSON Schema')
'JSON' and 'NDJSON' strings, files, or URLs. Query and
pivot support 'JSONpointer', 'JSONpath' or 'JMESpath'
expressions. The implementation uses the 'jsoncons'
<https://danielaparker.github.io/jsoncons/> header-only library;
Expand Down
2 changes: 1 addition & 1 deletion src/readbinbuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class readbinbuf : public std::streambuf {
buf_ = new char[n_bytes_];
}

~readbinbuf() { delete buf_; }
~readbinbuf() { delete[] buf_; }

int underflow() {
if (gptr() == egptr()) {
Expand Down
4 changes: 2 additions & 2 deletions src/rquerypivot.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class rquerypivot
// construct array of n_j 'null' to pad each key
Json pad(json_array_arg);
pad.reserve(n_j);
for (int i = 0; i < n_j; ++i)
for (std::size_t i = 0; i < n_j; ++i)
pad.push_back(Json::null());
for (auto& r_key : r_keys) {
result_[0][r_key].insert(
Expand All @@ -202,7 +202,7 @@ class rquerypivot
// construct array of n_r 'null' to pad each key
Json pad(json_array_arg);
pad.reserve(n_r);
for (int i = 0; i < n_r; ++i)
for (std::size_t i = 0; i < n_r; ++i)
pad.push_back(Json::null());
for (auto& j_key : j_keys) {
result_[0][j_key] = pad;
Expand Down

0 comments on commit 72a80a8

Please sign in to comment.