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

fix windows warnings (#5115)

This commit is contained in:
Wilfried Goesgens 2018-04-17 11:44:45 +02:00 committed by Max Neunhöffer
parent c0c149cf5b
commit 2b1ba8c524
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/EngineInfoContainerCoordinator.h
View File

@ -49,7 +49,9 @@ class EngineInfoContainerCoordinator {
public: public:
EngineInfo(QueryId id, size_t idOfRemoteNode); EngineInfo(QueryId id, size_t idOfRemoteNode);
~EngineInfo(); ~EngineInfo();
#if (_MSC_VER != 0)
#pragma warning( disable : 4521) // stfu wintendo.
#endif
EngineInfo(EngineInfo&) = delete; EngineInfo(EngineInfo&) = delete;
EngineInfo(EngineInfo const& other) = delete; EngineInfo(EngineInfo const& other) = delete;
EngineInfo(EngineInfo const&& other); EngineInfo(EngineInfo const&& other);

3
arangod/Aql/EngineInfoContainerDBServer.h
View File

@ -77,6 +77,9 @@ class EngineInfoContainerDBServer {
explicit EngineInfo(size_t idOfRemoteNode); explicit EngineInfo(size_t idOfRemoteNode);
~EngineInfo(); ~EngineInfo();
#if (_MSC_VER != 0)
#pragma warning( disable : 4521) // stfu wintendo.
#endif
EngineInfo(EngineInfo&) = delete; EngineInfo(EngineInfo&) = delete;
EngineInfo(EngineInfo const& other) = delete; EngineInfo(EngineInfo const& other) = delete;
EngineInfo(EngineInfo const&& other); EngineInfo(EngineInfo const&& other);

4
arangod/Aql/Functions.cpp
View File

@ -5699,7 +5699,7 @@ AqlValue Functions::CallApplyBackend(arangodb::aql::Query* query,
// call parameters // call parameters
v8::Handle<v8::Array> params = v8::Array::New(isolate, static_cast<int>(n)); v8::Handle<v8::Array> params = v8::Array::New(isolate, static_cast<int>(n));
for (size_t i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
params->Set(static_cast<uint32_t>(i), invokeParams[i].toV8(isolate, trx)); params->Set(static_cast<uint32_t>(i), invokeParams[i].toV8(isolate, trx));
} }
args[1] = params; args[1] = params;
@ -5707,7 +5707,7 @@ AqlValue Functions::CallApplyBackend(arangodb::aql::Query* query,
} else { } else {
// a call to a built-in V8 function // a call to a built-in V8 function
jsName = "AQL_" + func->nonAliasedName; jsName = "AQL_" + func->nonAliasedName;
for (size_t i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
args[i] = invokeParams[i].toV8(isolate, trx); args[i] = invokeParams[i].toV8(isolate, trx);
} }
} }

2
arangod/Cluster/ClusterMethods.cpp
View File

@ -2607,7 +2607,7 @@ std::shared_ptr<LogicalCollection> ClusterMethods::createCollectionOnCoordinator
bool waitForSyncReplication, bool waitForSyncReplication,
bool enforceReplicationFactor bool enforceReplicationFactor
) { ) {
auto col = std::make_unique<LogicalCollection>(vocbase, parameters, 0, true); auto col = std::make_unique<LogicalCollection>(vocbase, parameters, true, 0);
// Collection is a temporary collection object that undergoes sanity checks etc. // Collection is a temporary collection object that undergoes sanity checks etc.
// It is not used anywhere and will be cleaned up after this call. // It is not used anywhere and will be cleaned up after this call.
// Persist collection will return the real object. // Persist collection will return the real object.