Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api

2017-03-28 19:18:05 -04:00 · 2017-03-28 19:18:05 -04:00 · 8c024574d2
parent c1c7b27af0 fcd54f7a17
commit 8c024574d2
1 changed files with 3 additions and 0 deletions
--- a/arangod/RocksDBEngine/RocksDBCollection.cpp
+++ b/arangod/RocksDBEngine/RocksDBCollection.cpp
@ -57,10 +57,13 @@ namespace {

 static std::string const Empty;

+#if 0
+// currently unused. remove?
 static rocksdb::TransactionDB* db() {
  StorageEngine* engine = EngineSelectorFeature::ENGINE;
  return static_cast<RocksDBEngine*>(engine)->db();
 }
+#endif

 static inline rocksdb::Transaction* rocksTransaction(
    arangodb::transaction::Methods* trx) {