diff --git a/CHANGELOG b/CHANGELOG index 5a102801d5..cbc2f462ec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ v3.0.0 (XXXX-XX-XX) ------------------- +* added C++ implementations for AQL functions `SLICE()` and `CONTAINS()` + * as a consequence of the upgrade to V8 version 5, the implementation of the JavaScript `Buffer` object had to be changed. JavaScript `Buffer` objects in ArangoDB now always store their data on the heap. There is no shared pool diff --git a/lib/Basics/system-functions.cpp b/lib/Basics/system-functions.cpp index 1587b95a41..d0a145d053 100644 --- a/lib/Basics/system-functions.cpp +++ b/lib/Basics/system-functions.cpp @@ -52,8 +52,8 @@ void* memrchr(void const* block, int c, size_t size) { #ifdef _WIN32 -void* xmemmem(void const* haystack, size_t haystackLength, - void const* needle, size_t needleLength) { +void* memmem(void const* haystack, size_t haystackLength, + void const* needle, size_t needleLength) { if (haystackLength == 0 || needleLength == 0 || haystackLength < needleLength) {