Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' into ClustUp1

This commit is contained in:
Max Neunhoeffer 2015-12-07 14:18:06 +01:00
parent 6141c61bf4 749ac4a608
commit c5a09c82d0
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdParty/velocypack/include/velocypack/Parser.h vendored
View File

@ -157,7 +157,6 @@ class Parser {
if (options->clearBuilderBeforeParse) { if (options->clearBuilderBeforeParse) {
_b->clear(); _b->clear();
} }
_b->options = options;
return parseInternal(multi); return parseInternal(multi);
} }

2
3rdParty/velocypack/src/Parser.cpp vendored
View File

@ -38,8 +38,6 @@ using namespace arangodb::velocypack;
// build the result (build phase). // build the result (build phase).
ValueLength Parser::parseInternal(bool multi) { ValueLength Parser::parseInternal(bool multi) {
_b->options = options; // copy over options
// skip over optional BOM // skip over optional BOM
if (_size >= 3 && _start[0] == 0xef && _start[1] == 0xbb && if (_size >= 3 && _start[0] == 0xef && _start[1] == 0xbb &&
_start[2] == 0xbf) { _start[2] == 0xbf) {