Merge branch 'devel' of https://github.com/arangodb/arangodb into agency

2016-03-11 09:13:03 +01:00 · 2016-03-11 09:13:03 +01:00 · a2956fde7b
parent e3aa0fdd1f e7f1a7775d
commit a2956fde7b
1 changed files with 1 additions and 1 deletions
--- a/3rdParty/velocypack/include/velocypack/Buffer.h
+++ b/3rdParty/velocypack/include/velocypack/Buffer.h
@ -78,7 +78,7 @@ class Buffer {
          delete[] _buffer;
        }
        _buffer = buffer;
-        _alloc = that.pos;
+        _alloc = that._pos;
      }

      _pos = that._pos;