Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Deprecate the internal int/uint types in favor of the cstdint types they were based on

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-07-30 11:38:42 -07:00
parent 18e4976c6c
commit 54752ef9a1
218 changed files with 1331 additions and 1323 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/probabilistic/CardinalityCounter.cc
View file

@ -87,7 +87,7 @@ CardinalityCounter::CardinalityCounter(CardinalityCounter&& o)
CardinalityCounter::CardinalityCounter(double error_margin, double confidence)
{
int b = OptimalB(error_margin, confidence);
Init((uint64) pow(2, b));
Init((uint64_t) pow(2, b));
assert(b == p);
}
@ -202,7 +202,7 @@ broker::expected<broker::data> CardinalityCounter::Serialize() const
v.reserve(3 + m);
for ( size_t i = 0; i < m; ++i )
v.emplace_back(static_cast<uint64>(buckets[i]));
v.emplace_back(static_cast<uint64_t>(buckets[i]));
return {std::move(v)};
}
@ -213,8 +213,8 @@ std::unique_ptr<CardinalityCounter> CardinalityCounter::Unserialize(const broker
if ( ! (v && v->size() >= 3) )
return nullptr;
auto m = caf::get_if<uint64>(&(*v)[0]);
auto V = caf::get_if<uint64>(&(*v)[1]);
auto m = caf::get_if<uint64_t>(&(*v)[0]);
auto V = caf::get_if<uint64_t>(&(*v)[1]);
auto alpha_m = caf::get_if<double>(&(*v)[2]);
if ( ! (m && V && alpha_m) )
@ -230,7 +230,7 @@ std::unique_ptr<CardinalityCounter> CardinalityCounter::Unserialize(const broker
for ( size_t i = 0; i < *m; ++i )
{
auto x = caf::get_if<uint64>(&(*v)[3 + i]);
auto x = caf::get_if<uint64_t>(&(*v)[3 + i]);
if ( ! x )
return nullptr;