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

prevent VS warnings

This commit is contained in:
Jan Steemann 2016-06-28 17:16:48 +02:00
parent 045e411403
commit 8002607b67
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/EnumerateCollectionBlock.cpp
View File

@ -200,7 +200,7 @@ AqlItemBlock* EnumerateCollectionBlock::getSome(size_t, // atLeast,
for (size_t j = 0; j < toSend; j++) {
if (j > 0) {
// re-use already copied AQLValues
res->copyValuesFromFirstRow(j, curRegs);
res->copyValuesFromFirstRow(static_cast<RegisterId>(j), curRegs);
}
if (_mustStoreResult) {

2
arangod/Aql/IndexBlock.cpp
View File

@ -520,7 +520,7 @@ AqlItemBlock* IndexBlock::getSome(size_t atLeast, size_t atMost) {
for (size_t j = 0; j < toSend; j++) {
if (j > 0) {
// re-use already copied AqlValues
res->copyValuesFromFirstRow(j, curRegs);
res->copyValuesFromFirstRow(static_cast<RegisterId>(j), curRegs);
}
// The result is in the first variable of this depth,

2
arangod/Aql/TraversalBlock.cpp
View File

@ -458,7 +458,7 @@ AqlItemBlock* TraversalBlock::getSome(size_t, // atLeast,
for (size_t j = 0; j < toSend; j++) {
if (j > 0) {
// re-use already copied aqlvalues
res->copyValuesFromFirstRow(j, curRegs);
res->copyValuesFromFirstRow(static_cast<RegisterId>(j), curRegs);
}
if (usesVertexOutput()) {
res->setValue(j, _vertexReg, _vertices[_posInPaths].clone());

4
lib/Basics/StringRef.h
View File

@ -113,7 +113,7 @@ class StringRef {
if (res != 0) {
return res;
}
return (_length - other.size());
return static_cast<int>(_length) - static_cast<int>(other.size());
}
int compare(StringRef const& other) const {
@ -121,7 +121,7 @@ class StringRef {
if (res != 0) {
return res;
}
return (_length - other._length);
return static_cast<int>(_length) - static_cast<int>(other._length);
}
inline std::string toString() const {