aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-11-19 21:06:33 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2016-11-19 21:06:33 +0100
commit7083895ef0834088bd73f29cb869d7ead7901b60 (patch)
treed170003d1290cbc6242c0d709e0d6019dbcce6e5 /searchlib
parentde6bb3ea4dfea88a8e6800f2557def16212a5b75 (diff)
assert(false) -> abort()
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/common/bitvector.cpp12
-rw-r--r--searchlib/src/vespa/searchlib/common/packets.cpp6
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp3
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp3
4 files changed, 8 insertions, 16 deletions
diff --git a/searchlib/src/vespa/searchlib/common/bitvector.cpp b/searchlib/src/vespa/searchlib/common/bitvector.cpp
index e21d6c8e87a..968a08d9eb4 100644
--- a/searchlib/src/vespa/searchlib/common/bitvector.cpp
+++ b/searchlib/src/vespa/searchlib/common/bitvector.cpp
@@ -273,18 +273,14 @@ BitVector::hasTrueBitsInternal(void) const
// Set new length. Destruction of content
//////////////////////////////////////////////////////////////////////
void
-BitVector::resize(Index newLength)
+BitVector::resize(Index)
{
- (void) newLength;
- assert(false);
+ abort();
}
GenerationHeldBase::UP
-BitVector::grow(Index newSize, Index newCapacity)
+BitVector::grow(Index, Index )
{
- (void) newSize;
- (void) newCapacity;
- assert(false);
- return GenerationHeldBase::UP();
+ abort();
}
size_t
diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp
index 190f4d4ef63..b453c0c262e 100644
--- a/searchlib/src/vespa/searchlib/common/packets.cpp
+++ b/searchlib/src/vespa/searchlib/common/packets.cpp
@@ -467,8 +467,7 @@ FS4Packet_Shared::Encode(FNET_DataBuffer *dst)
bool
FS4Packet_Shared::Decode(FNET_DataBuffer *, uint32_t )
{
- assert(false);
- return false;
+ abort();
}
vespalib::string
@@ -536,8 +535,7 @@ FS4Packet_PreSerialized::Encode(FNET_DataBuffer *dst)
bool
FS4Packet_PreSerialized::Decode(FNET_DataBuffer *, uint32_t)
{
- assert(false);
- return false;
+ abort();
}
vespalib::string
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
index 44172b95f92..baf1752a01e 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
@@ -671,8 +671,7 @@ int32_t DomainPart::calcCrc(Crc version, const void * buf, size_t sz)
calculator.process_bytes(buf, sz);
return calculator.checksum();
} else {
- assert(false);
- return 0;
+ abort();
}
}
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
index b82e9f7ebe3..fdfd9189cd8 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
@@ -34,8 +34,7 @@ DomainPart::Crc getCrc(searchlib::TranslogserverConfig::Crcmethod crcType)
case searchlib::TranslogserverConfig::xxh64:
return DomainPart::xxh64;
}
- assert(false);
- return DomainPart::xxh64;
+ abort();
}
}