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

don't use void*

This commit is contained in:
Jan Steemann 2015-08-19 12:56:32 +02:00
parent 338dd7e100
commit e01e874073
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/VocBase/vocbase.cpp
View File

@ -1506,7 +1506,7 @@ void TRI_DestroyVocBase (TRI_vocbase_t* vocbase) {
// mark all cursors as deleted so underlying collections can be freed soon // mark all cursors as deleted so underlying collections can be freed soon
if (vocbase->_cursorRepository != nullptr) { if (vocbase->_cursorRepository != nullptr) {
static_cast<triagens::arango::CursorRepository*>(vocbase->_cursorRepository)->garbageCollect(true); vocbase->_cursorRepository->garbageCollect(true);
} }
std::vector<TRI_vocbase_col_t*> collections; std::vector<TRI_vocbase_col_t*> collections;
@ -2446,8 +2446,8 @@ TRI_vocbase_t::~TRI_vocbase_t () {
TRI_DestroyAssociativePointer(&_collectionsByName); TRI_DestroyAssociativePointer(&_collectionsByName);
TRI_DestroyAssociativePointer(&_collectionsById); TRI_DestroyAssociativePointer(&_collectionsById);
delete static_cast<triagens::arango::CursorRepository*>(_cursorRepository); delete _cursorRepository;
delete static_cast<triagens::aql::QueryList*>(_queries); delete _queries;
// free name and path // free name and path
if (_path != nullptr) { if (_path != nullptr) {

13
arangod/VocBase/vocbase.h
View File

@ -51,6 +51,15 @@ struct TRI_server_t;
struct TRI_vocbase_col_s; struct TRI_vocbase_col_s;
struct TRI_vocbase_defaults_s; struct TRI_vocbase_defaults_s;
namespace triagens {
namespace aql {
class QueryList;
}
namespace arango {
class CursorRepository;
}
}
extern bool IGNORE_DATAFILE_ERRORS; extern bool IGNORE_DATAFILE_ERRORS;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -287,8 +296,8 @@ struct TRI_vocbase_t {
// structures for user-defined volatile data // structures for user-defined volatile data
void* _userStructures; void* _userStructures;
void* _queries; triagens::aql::QueryList* _queries;
void* _cursorRepository; triagens::arango::CursorRepository* _cursorRepository;
TRI_associative_pointer_t _authInfo; TRI_associative_pointer_t _authInfo;
TRI_associative_pointer_t _authCache; TRI_associative_pointer_t _authCache;