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

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

This commit is contained in:
Jan Steemann 2015-07-30 12:20:34 +02:00
parent 24b44e474f 65d312d2b9
commit 1e140aee93
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/VocBase/VocShaper.cpp
View File

@ -542,7 +542,7 @@ TRI_shape_aid_t VocShaper::findOrCreateAttributeByName (char const* name) {
THROW_ARANGO_EXCEPTION(slotInfo.errorCode); THROW_ARANGO_EXCEPTION(slotInfo.errorCode);
} }
void* f; void* TRI_UNUSED f;
{ {
WRITE_LOCKER(_attributeIdsLock); WRITE_LOCKER(_attributeIdsLock);
f = TRI_InsertKeyAssociativePointer(&_attributeIds, &aid, const_cast<void*>(slotInfo.mem), false); f = TRI_InsertKeyAssociativePointer(&_attributeIds, &aid, const_cast<void*>(slotInfo.mem), false);