diff --git a/CHANGES b/CHANGES index be93a15770..5894ead16d 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Various deprecation fixes, reported by failed Spicy builds (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 301f0ea0d2..e749c36f90 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.915 +3.2.0-dev.919 diff --git a/src/Obj.h b/src/Obj.h index d26b0da84b..9072366527 100644 --- a/src/Obj.h +++ b/src/Obj.h @@ -201,13 +201,13 @@ using BroObj [[deprecated("Remove in v4.1. Use zeek::Obj instead.")]] = zeek::Ob extern void print(const zeek::Obj* obj); [[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); } [[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); }