1
0
Fork 0

fix compile warnings (#8743)

This commit is contained in:
Jan 2019-04-15 11:22:24 +02:00 committed by GitHub
parent fe58c54b2d
commit 13b2d40aef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 11 deletions

View File

@ -42,7 +42,7 @@ namespace {
void eraseRow(SharedAqlItemBlockPtr& block, size_t row) { void eraseRow(SharedAqlItemBlockPtr& block, size_t row) {
arangodb::aql::RegisterId const nrRegs = block->getNrRegs(); arangodb::aql::RegisterId const nrRegs = block->getNrRegs();
for (size_t i = 0; i < nrRegs; i++) { for (arangodb::aql::RegisterId i = 0; i < nrRegs; i++) {
block->destroyValue(row, i); block->destroyValue(row, i);
} }
} }

View File

@ -35,7 +35,7 @@ size_t ExecutorExpressionContext::numRegisters() const {
} }
AqlValue const& ExecutorExpressionContext::getRegisterValue(size_t i) const { AqlValue const& ExecutorExpressionContext::getRegisterValue(size_t i) const {
return _inputRow.getValue(i); return _inputRow.getValue(static_cast<arangodb::aql::RegisterId>(i));
} }
Variable const* ExecutorExpressionContext::getVariable(size_t i) const { Variable const* ExecutorExpressionContext::getVariable(size_t i) const {

View File

@ -42,7 +42,7 @@ bool InputAqlItemRow::internalBlockIs(SharedAqlItemBlockPtr const& other) const
SharedAqlItemBlockPtr InputAqlItemRow::cloneToBlock(AqlItemBlockManager& manager, SharedAqlItemBlockPtr InputAqlItemRow::cloneToBlock(AqlItemBlockManager& manager,
std::unordered_set<RegisterId> const& registers, std::unordered_set<RegisterId> const& registers,
size_t newNrRegs) const { size_t newNrRegs) const {
SharedAqlItemBlockPtr block = manager.requestBlock(1, newNrRegs); SharedAqlItemBlockPtr block = manager.requestBlock(1, static_cast<RegisterId>(newNrRegs));
if (isInitialized()) { if (isInitialized()) {
std::unordered_set<AqlValue> cache; std::unordered_set<AqlValue> cache;
TRI_ASSERT(getNrRegisters() <= newNrRegs); TRI_ASSERT(getNrRegisters() <= newNrRegs);

View File

@ -121,11 +121,11 @@ GeneralServer::IoContext::~IoContext() { stop(); }
void GeneralServer::IoContext::stop() { _asioIoContext.stop(); } void GeneralServer::IoContext::stop() { _asioIoContext.stop(); }
GeneralServer::IoContext& GeneralServer::selectIoContext() { GeneralServer::IoContext& GeneralServer::selectIoContext() {
uint32_t low = _contexts[0]._clients.load(); uint64_t low = _contexts[0]._clients.load();
size_t lowpos = 0; size_t lowpos = 0;
for (size_t i = 1; i < _contexts.size(); ++i) { for (size_t i = 1; i < _contexts.size(); ++i) {
uint32_t x = _contexts[i]._clients.load(); uint64_t x = _contexts[i]._clients.load();
if (x < low) { if (x < low) {
low = x; low = x;
lowpos = i; lowpos = i;

View File

@ -933,7 +933,7 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
bool created; bool created;
auto unused = physical->createIndex(payloadSlice, /*restore*/ true, created); auto unused = physical->createIndex(payloadSlice, /*restore*/ true, created);
TRI_ASSERT(unused != nullptr); TRI_ASSERT(unused != nullptr);
} catch (basics::Exception const& e) { } catch (basics::Exception const&) {
LOG_TOPIC("92fdf", WARN, arangodb::Logger::ENGINES) LOG_TOPIC("92fdf", WARN, arangodb::Logger::ENGINES)
<< "cannot create index " << indexId << ", collection " << "cannot create index " << indexId << ", collection "
<< collectionId << " in database " << databaseId; << collectionId << " in database " << databaseId;

View File

@ -233,7 +233,7 @@ class MMFilesFlushMarker final: public arangodb::MMFilesWalMarker {
TRI_voc_fid_t fid() const override final { return 0; } TRI_voc_fid_t fid() const override final { return 0; }
uint32_t size() const override final { uint32_t size() const override final {
return sizeof(MMFilesMarker) + sizeof(TRI_voc_tick_t) + _slice.byteSize(); return static_cast<uint32_t>(sizeof(MMFilesMarker) + sizeof(TRI_voc_tick_t) + _slice.byteSize());
} }
arangodb::velocypack::Slice const& slice() const noexcept { return _slice; } arangodb::velocypack::Slice const& slice() const noexcept { return _slice; }

View File

@ -57,7 +57,7 @@ int compareIndexedValues(arangodb::velocypack::Slice const& lhs,
++rhsIter; ++rhsIter;
} }
return lLength - rLength; return static_cast<int>(lLength - rLength);
} }
} // namespace } // namespace
@ -112,5 +112,5 @@ int RocksDBVPackComparator::compareIndexValues(rocksdb::Slice const& lhs,
} }
} }
return lSize - rSize; return static_cast<int>(lSize - rSize);
} }

View File

@ -152,7 +152,7 @@ class RocksDBReplicationContext {
bool fail() const { return _result.fail(); } bool fail() const { return _result.fail(); }
int errorNumber() const { return _result.errorNumber(); } int errorNumber() const { return _result.errorNumber(); }
std::string errorMessage() const { return _result.errorMessage(); } std::string errorMessage() const { return _result.errorMessage(); }
bool is(uint64_t code) const { return _result.is(code); } bool is(int code) const { return _result.is(code); }
// access methods // access methods
Result const& result() const& { return _result; } Result const& result() const& { return _result; }

View File

@ -770,7 +770,7 @@ namespace {
return true; return true;
} }
int dist = std::distance(begin, end); auto dist = std::distance(begin, end);
bool notF1 = first.isNone() || (dist == 1 && !first.isObject()); bool notF1 = first.isNone() || (dist == 1 && !first.isObject());
bool notF2 = second.isNone() || (dist == 1 && !second.isObject()); bool notF2 = second.isNone() || (dist == 1 && !second.isObject());
if (notF1 != notF2) { if (notF1 != notF2) {