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

Merge remote-tracking branch 'origin/topic/timw/deprecation-fixes-for-spicy'

Browse source 
* origin/topic/timw/deprecation-fixes-for-spicy:
  Use namespaced version of Location to silence warnings
  Various deprecation fixes, reported by failed Spicy builds
  Add deprecated version of EnumType::GetVal() to returns EnumVal*, rename IntrusivePtr version to GetEnumVal
This commit is contained in:
Jon Siwek 2020-07-17 16:37:11 -07:00
commit bd5108022f
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.2.0-dev.919 | 2020-07-17 16:37:11 -0700
* Use namespaced version of Location to silence warnings (Tim Wojtulewicz, Corelight)
3.2.0-dev.915 | 2020-07-17 16:10:46 -0700 3.2.0-dev.915 | 2020-07-17 16:10:46 -0700
* Various deprecation fixes, reported by failed Spicy builds (Tim Wojtulewicz, Corelight) * Various deprecation fixes, reported by failed Spicy builds (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.915 3.2.0-dev.919

4
src/Obj.h
View file

@ -201,13 +201,13 @@ using BroObj [[deprecated("Remove in v4.1. Use zeek::Obj instead.")]] = zeek::Ob
extern void print(const zeek::Obj* obj); extern void print(const zeek::Obj* obj);
[[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]] [[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]]
inline void set_location(const Location loc) inline void set_location(const zeek::detail::Location loc)
{ {
zeek::detail::set_location(loc); zeek::detail::set_location(loc);
} }
[[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]] [[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]]
inline void set_location(const Location start, const Location end) inline void set_location(const zeek::detail::Location start, const zeek::detail::Location end)
{ {
zeek::detail::set_location(start, end); zeek::detail::set_location(start, end);
} }