mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Merge remote-tracking branch 'markoverholser/master'
* markoverholser/master: Fix incorrect syntax for static_cast in to_count that I introduced in a previous merge Update baselines after changes to to_count and to_int fix to_count in zeek.bif to resolve conflict from bbanier's adjustment to static casting of the return from strtoull Fix tests in to_count to reflect appropriate function; add tests for 0x-formatted hex values for to_count and to_int update BIFs to_int() and to_count() to accept optional 'base' argument; allows more more exotic conversions from hex, octal, binary Fixes #4076; update BIFs to_int() and to_count() to accept optional 'base' argument for more easy conversions of strings representing (for example) hexadecimal, octal, or binary numbers
This commit is contained in:
commit
66e3232dcc
12 changed files with 46 additions and 12 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
7.2.0-dev.217
|
||||
7.2.0-dev.228
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue