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

try to fix windows compile warnings and errors

This commit is contained in:
jsteemann 2018-07-13 11:48:05 +02:00
parent a98cec3fdd
commit 2d9e5288ab
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arangod/Aql/ClusterNodes.cpp
View File

@ -22,15 +22,15 @@
////////////////////////////////////////////////////////////////////////////////
#include "ClusterNodes.h"
#include "Aql/Ast.h"
#include "Aql/AqlValue.h"
#include "Aql/Collection.h"
#include "Aql/ModificationNodes.h"
#include "Aql/Ast.h"
#include "Aql/ClusterBlocks.h"
#include "Aql/Collection.h"
#include "Aql/ExecutionPlan.h"
#include "Aql/Query.h"
#include "Aql/IndexNode.h"
#include "Aql/GraphNode.h"
#include "Aql/IndexNode.h"
#include "Aql/ModificationNodes.h"
#include "Aql/Query.h"
#include "Transaction/Methods.h"
#include <type_traits>
@ -379,15 +379,12 @@ double GatherNode::estimateCost(size_t& nrItems) const {
return depCost + nrItems;
}
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
SingleRemoteOperationNode::SingleRemoteOperationNode(ExecutionPlan* plan,
size_t id,
NodeType mode,
bool replaceIndexNode,
std::string const& key,
aql::Collection const* collection,
Collection const* collection,
ModificationOptions const& options,
Variable const* in,
Variable const* out,

4
arangosh/Restore/RestoreFeature.cpp
View File

@ -827,8 +827,8 @@ void RestoreFeature::validateOptions(
_options.chunkSize = 1024 * 128;
}
auto clamped = boost::algorithm::clamp(_options.threadCount, 1,
4 * TRI_numberProcessors());
auto clamped = boost::algorithm::clamp(_options.threadCount, uint32_t(1),
uint32_t(4 * TRI_numberProcessors()));
if (_options.threadCount != clamped) {
LOG_TOPIC(WARN, Logger::RESTORE) << "capping --threads value to " << clamped;
_options.threadCount = clamped;