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

Bugfix/fix windows warnings (#5116) 

* fix windows warnings
This commit is contained in:
Wilfried Goesgens 2018-04-17 12:38:59 +02:00 committed by Max Neunhöffer
parent 2b1ba8c524
commit d18e760150
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/MMFiles/MMFilesDatafile.cpp
View File

@ -1203,7 +1203,7 @@ int MMFilesDatafile::truncateAndSeal(uint32_t position) {
TRI_ASSERT(_initSize == _maximalSize); TRI_ASSERT(_initSize == _maximalSize);
TRI_ASSERT(maximalSize <= _initSize); TRI_ASSERT(maximalSize <= _initSize);
_maximalSize = static_cast<uint32_t>(maximalSize); _maximalSize = static_cast<uint32_t>(maximalSize);
_initSize = maximalSize; _initSize = static_cast<uint32_t>(maximalSize);
_fd = fd; _fd = fd;
_mmHandle = mmHandle; _mmHandle = mmHandle;
_state = TRI_DF_STATE_WRITE; _state = TRI_DF_STATE_WRITE;

1
tests/IResearch/IResearchAnalyzerFeature-test.cpp
View File

@ -678,7 +678,6 @@ SECTION("test_persistence") {
{ {
arangodb::OperationOptions options; arangodb::OperationOptions options;
arangodb::ManagedDocumentResult result; arangodb::ManagedDocumentResult result;
TRI_voc_tick_t resultMarkerTick;
auto collection = vocbase->lookupCollection("_iresearch_analyzers"); auto collection = vocbase->lookupCollection("_iresearch_analyzers");
collection->truncate(nullptr, options); collection->truncate(nullptr, options);
} }

2
tests/IResearch/IResearchQueryJoin-test.cpp
View File

@ -165,7 +165,7 @@ struct CustomScorer : public irs::sort {
CustomScorer(size_t i) : irs::sort(CustomScorer::type()), i(i) {} CustomScorer(size_t i) : irs::sort(CustomScorer::type()), i(i) {}
virtual irs::sort::prepared::ptr prepare() const override { virtual irs::sort::prepared::ptr prepare() const override {
return irs::memory::make_unique<Prepared>(i); return irs::memory::make_unique<Prepared>(static_cast<float_t>(i));
} }
size_t i; size_t i;