Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/deprecate-int-types'

Browse source 
* origin/topic/timw/deprecate-int-types:
  Deprecate the internal int/uint types in favor of the cstdint types they were based on

Merge adjustments:
  * A bpf type mistakenly got replaced (inside an unlikely #ifdef)
  * Did a few substitutions that got missed (likely due to
    pre-processing out of DEBUG macros)
This commit is contained in:
Jon Siwek 2019-08-14 15:38:02 -07:00
commit 47235b57a6
222 changed files with 1343 additions and 1327 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/broker/Manager.cc
View file

@ -322,7 +322,7 @@ void Manager::Peer(const string& addr, uint16_t port, double retry)
// Ensure that it doesn't get turned into zero.
retry = 1.0;
auto secs = broker::timeout::seconds(static_cast<uint64>(retry));
auto secs = broker::timeout::seconds(static_cast<uint64_t>(retry));
bstate->endpoint.peer_nosync(addr, port, secs);
auto counts_as_iosource = get_option("Broker::peer_counts_as_iosource")->AsBool();