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

Fixing warnings

This commit is contained in:
Simon Grätzer 2017-04-20 19:07:30 +02:00
parent ec848b879f
commit 98df9c21a2
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/Aql/ExecutionPlan.cpp
View File

@ -143,7 +143,9 @@ static std::unique_ptr<graph::BaseOptions> CreateTraversalOptions(
"supported, with bfs: true due to " "supported, with bfs: true due to "
"unpredictable results."); "unpredictable results.");
} }
return options; std::unique_ptr<graph::BaseOptions> ret(options.get());
options.release();
return ret;
} }
static std::unique_ptr<graph::BaseOptions> CreateShortestPathOptions( static std::unique_ptr<graph::BaseOptions> CreateShortestPathOptions(
@ -171,7 +173,9 @@ static std::unique_ptr<graph::BaseOptions> CreateShortestPathOptions(
} }
} }
} }
return options; std::unique_ptr<graph::BaseOptions> ret(options.get());
options.release();
return ret;
} }
/// @brief create the plan /// @brief create the plan

2
arangod/Aql/GraphNode.h
View File

@ -31,7 +31,7 @@
namespace arangodb { namespace arangodb {
namespace graph { namespace graph {
class BaseOptions; struct BaseOptions;
} }
namespace aql { namespace aql {

6
arangod/Aql/TraversalNode.h
View File

@ -32,15 +32,15 @@
namespace arangodb { namespace arangodb {
namespace aql { namespace aql {
class Collection; struct Collection;
} }
namespace graph { namespace graph {
class BaseOptions; struct BaseOptions;
} }
namespace traverser { namespace traverser {
class TraverserOptions; struct TraverserOptions;
} }
namespace aql { namespace aql {

2
arangod/Cluster/ClusterEdgeCursor.h
View File

@ -31,7 +31,7 @@ namespace arangodb {
class CollectionNameResolver; class CollectionNameResolver;
namespace graph { namespace graph {
class BaseOptions; struct BaseOptions;
class ClusterTraverserCache; class ClusterTraverserCache;
} }

2
arangod/Graph/ClusterTraverserCache.h
View File

@ -32,7 +32,7 @@ namespace arangodb {
class StringRef; class StringRef;
namespace aql { namespace aql {
class AqlValue; struct AqlValue;
} }
namespace transaction { namespace transaction {

1
arangod/RocksDBEngine/RocksDBEngine.cpp
View File

@ -82,7 +82,6 @@ std::string const RocksDBEngine::FeatureName("RocksDBEngine");
RocksDBEngine::RocksDBEngine(application_features::ApplicationServer* server) RocksDBEngine::RocksDBEngine(application_features::ApplicationServer* server)
: StorageEngine(server, EngineName, FeatureName, new RocksDBIndexFactory()), : StorageEngine(server, EngineName, FeatureName, new RocksDBIndexFactory()),
_db(nullptr), _db(nullptr),
_replicationManager(nullptr),
_cmp(new RocksDBComparator()), _cmp(new RocksDBComparator()),
_maxTransactionSize((std::numeric_limits<uint64_t>::max)()), _maxTransactionSize((std::numeric_limits<uint64_t>::max)()),
_intermediateTransactionCommitSize(32 * 1024 * 1024), _intermediateTransactionCommitSize(32 * 1024 * 1024),