8000 fix MSVC compile warnings · sleepycat/arangodb@600bd60 · GitHub
[go: up one dir, main page]
Skip to content

Commit 600bd60

Browse files
jsteemannjsteemann
committed
fix MSVC compile warnings
1 parent b8e1eb8 commit 600bd60

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

‎arangod/Aql/Ast.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <velocypack/Slice.h>
4040
#include <velocypack/velocypack-aliases.h>
4141

42+
using namespace arangodb;
4243
using namespace arangodb::aql;
4344

4445
/// @brief initialize a singleton no-op node instance

‎arangod/Aql/BlockCollector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ BlockCollector::~BlockCollector() { clear(); }
3636

3737
size_t BlockCollector::totalSize() const { return _totalSize; }
3838

39-
size_t BlockCollector::nrRegs() const {
39+
RegisterId BlockCollector::nrRegs() const {
4040
TRI_ASSERT(_totalSize > 0);
4141
TRI_ASSERT(!_blocks.empty());
4242
return _blocks[0]->getNrRegs();

‎arangod/Aql/BlockCollector.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#define ARANGOD_AQL_BLOCK_COLLECTOR_H 1
2626

2727
#include "Basics/Common.h"
28+
#include "Aql/types.h"
2829

2930
namespace arangodb {
3031
namespace aql {
@@ -42,7 +43,7 @@ class BlockCollector {
4243
~BlockCollector();
4344

4445
size_t totalSize() const;
45-
size_t nrRegs() const;
46+
RegisterId nrRegs() const;
4647

4748
void clear();
4849

‎arangod/Aql/Collections.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "Aql/Collection.h"
2626
#include "Basics/Exceptions.h"
2727

28+
using namespace arangodb;
2829
using namespace arangodb::aql;
2930

3031
Collections::Collections(TRI_vocbase_t* vocbase)

‎arangod/Aql/Expression.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ AqlValue Expression::executeSimpleExpressionFCall(
869869
VPackFunctionParameters parameters{arena};
870870

871871
// same here
872-
SmallVector<int, 64>::allocator_type::arena_type arena2;
873-
SmallVector<int, 64> destroyParameters{arena2};
872+
SmallVector<uint8_t, 64>::allocator_type::arena_type arena2;
873+
SmallVector<uint8_t, 64> destroyParameters{arena2};
874874
parameters.reserve(n);
875875
destroyParameters.reserve(n);
876876

‎arangod/Utils/Transaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1760,7 +1760,7 @@ static double chooseTimeout(size_t count) {
17601760
// We usually assume that a server can process at least 5000 documents
17611761
// per second (this is a low estimate), and use a low limit of 0.5s
17621762
// and a high timeout of 120s
1763-
double timeout = count / 5000;
1763+
double timeout = static_cast<double>(count / 5000);
17641764
if (timeout < 0.5) {
17651765
return 0.5;
17661766
} else if (timeout > 120) {

0 commit comments

Comments
 (0)
0