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

issue #582: ifdef'd unused feature

This commit is contained in:
Jan Steemann 2013-09-01 12:13:11 +02:00
parent 77be290767
commit aa4aa7bf95
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/VocBase/index-garbage-collector.c
View File

@ -38,6 +38,7 @@
#include "VocBase/index.h" #include "VocBase/index.h"
#include "VocBase/transaction.h" #include "VocBase/transaction.h"
#ifdef TRI_SKIPLIST_EX
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -995,6 +996,8 @@ static int ExciseNodeSwapPointersUndo(linked_list_node_t* nodeToExcise, linked_l
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#endif
// Local Variables: // Local Variables:
// mode: outline-minor // mode: outline-minor
// outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}" // outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}"

4
lib/BasicsC/locks-posix.c
View File

@ -553,7 +553,7 @@ void TRI_UnlockCondition (TRI_condition_t* cond) {
#ifdef TRI_SKIPLIST_EX
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// COMPARE & SWAP operations below for MAC and GNUC // COMPARE & SWAP operations below for MAC and GNUC
@ -678,6 +678,8 @@ bool TRI_ComparePointer(void* volatile* theValue, void* oldValue) {
#endif #endif
} }
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

2
lib/BasicsC/locks-win32.c
View File

@ -900,6 +900,7 @@ void TRI_UnlockCondition (TRI_condition_t* cond) {
} }
#ifdef TRI_SKIPLIST_EX
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// COMPARE & SWAP operations below for windows // COMPARE & SWAP operations below for windows
@ -966,6 +967,7 @@ bool TRI_ComparePointer(void* volatile* theValue, void* oldValue) {
return ( InterlockedCompareExchangePointer(theValue, oldValue, oldValue) == oldValue ); return ( InterlockedCompareExchangePointer(theValue, oldValue, oldValue) == oldValue );
} }
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}

2
lib/BasicsC/locks.h
View File

@ -386,6 +386,7 @@ void TRI_UnlockCondition (TRI_condition_t* cond);
/// @{ /// @{
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_SKIPLIST_EX
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief performs an atomic compare and swap operation on a 32bit integer. /// @brief performs an atomic compare and swap operation on a 32bit integer.
@ -451,6 +452,7 @@ bool TRI_ComparePointer(void* volatile* theValue, void* oldValue);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }