Adjust some types in searchlib module.

4 files changed, 10 insertions, 10 deletions

diff --git a/searchlib/src/tests/sortspec/multilevelsort.cpp b/searchlib/src/tests/sortspec/multilevelsort.cpp
index 4d81cf303d7..84f67a041b0 100644
--- a/searchlib/src/tests/sortspec/multilevelsort.cpp
+++ b/searchlib/src/tests/sortspec/multilevelsort.cpp
@@ -241,7 +241,7 @@ MultilevelSortTest::sortAndCheck(const std::vector<Spec> &spec, uint32_t num,
     }
 
     vespalib::Clock clock;
-    vespalib::Doom doom(clock, std::numeric_limits<long>::max());
+    vespalib::Doom doom(clock, std::numeric_limits<fastos::TimeStamp::TimeT>::max());
     search::uca::UcaConverterFactory ucaFactory;
     FastS_SortSpec sorter(7, doom, ucaFactory, _sortMethod);
     // init sorter with sort data
diff --git a/searchlib/src/vespa/searchlib/common/bitvector.cpp b/searchlib/src/vespa/searchlib/common/bitvector.cpp
index ddc4f7af944..2c45bc8f69a 100644
--- a/searchlib/src/vespa/searchlib/common/bitvector.cpp
+++ b/searchlib/src/vespa/searchlib/common/bitvector.cpp
@@ -385,9 +385,9 @@ MMappedBitVector::read(Index numberOfElements, FastOS_FileInterface &file,
 nbostream &
 operator<<(nbostream &out, const BitVector &bv)
 {
-    size_t size = bv.size();
-    size_t cachedHits = bv.countTrueBits();
-    size_t fileBytes = bv.getFileBytes();
+    uint64_t size = bv.size();
+    uint64_t cachedHits = bv.countTrueBits();
+    uint64_t fileBytes = bv.getFileBytes();
     assert(size <= std::numeric_limits<BitVector::Index>::max());
     assert(cachedHits <= size || ! bv.isValidCount(cachedHits));
     assert(bv.testBit(size));
@@ -400,9 +400,9 @@ operator<<(nbostream &out, const BitVector &bv)
 nbostream &
 operator>>(nbostream &in, BitVector &bv)
 {
-    size_t size;
-    size_t cachedHits;
-    size_t fileBytes;
+    uint64_t size;
+    uint64_t cachedHits;
+    uint64_t fileBytes;
     in >> size >> cachedHits >> fileBytes;
     assert(size <= std::numeric_limits<BitVector::Index>::max());
     assert(cachedHits <= size || ! bv.isValidCount(cachedHits));
diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp
index e7ec0ffc9b9..9862e221610 100644
--- a/searchlib/src/vespa/searchlib/common/packets.cpp
+++ b/searchlib/src/vespa/searchlib/common/packets.cpp
@@ -1312,7 +1312,7 @@ uint32_t FS4Packet::readUInt32(FNET_DataBuffer & buf, uint32_t & len, const char
 void
 FS4Packet_GETDOCSUMSX::setTimeout(const fastos::TimeStamp & timeout)
 {
-    _timeout = std::max(0l, timeout.ms());
+    _timeout = std::max(INT64_C(0), timeout.ms());
 }
 
 fastos::TimeStamp
@@ -1324,7 +1324,7 @@ FS4Packet_GETDOCSUMSX::getTimeout() const
 void
 FS4Packet_QUERYX::setTimeout(const fastos::TimeStamp & timeout)
 {
-    _timeout = std::max(0l, timeout.ms());
+    _timeout = std::max(INT64_C(0), timeout.ms());
 }
 
 fastos::TimeStamp
diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
index 78ed12ac8da..2f59bb30847 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
@@ -77,7 +77,7 @@ SimpleQueryStackDumpIterator::next()
 
     uint64_t tmp(0);
     if (ParseItem::GetFeature_Weight(typefield)) {
-        long tmpLong;
+        int64_t tmpLong;
         if (p >= _bufEnd) return false;
         p += vespalib::compress::Integer::decompress(tmpLong, p);
         _currWeight.setPercent(tmpLong);