Remove all of the random single-file deprecations

These are the changes that don't require a ton of changes to other files outside
of the original removal.

src/Attr.cc

@@ -150,25 +150,6 @@ void Attr::AddTag(ODesc* d) const
 		d->Add(attr_name(Tag()));
 	}
 
-Attributes::Attributes(AttrPList* a, TypePtr t, bool arg_in_record, bool is_global)
-	{
-	attrs_list.resize(a->length());
-	attrs.reserve(a->length());
-	in_record = arg_in_record;
-	global_var = is_global;
-
-	SetLocationInfo(&start_location, &end_location);
-
-	// We loop through 'a' and add each attribute individually,
-	// rather than just taking over 'a' for ourselves, so that
-	// the necessary checking gets done.
-
-	for ( const auto& attr : *a )
-		AddAttr({NewRef{}, attr});
-
-	delete a;
-	}
-
 Attributes::Attributes(TypePtr t, bool arg_in_record, bool is_global)
     : Attributes(std::vector<AttrPtr>{}, std::move(t),
                  arg_in_record, is_global)
@@ -178,7 +159,6 @@ Attributes::Attributes(std::vector<AttrPtr> a,
                        TypePtr t, bool arg_in_record, bool is_global)
 	: type(std::move(t))
 	{
-	attrs_list.resize(a.size());
 	attrs.reserve(a.size());
 	in_record = arg_in_record;
 	global_var = is_global;
@@ -224,7 +204,6 @@ void Attributes::AddAttr(AttrPtr attr, bool is_redef)
 
 	// We overwrite old attributes by deleting them first.
 	RemoveAttr(attr->Tag());
-	attrs_list.push_back(attr.get());
 	attrs.emplace_back(attr);
 
 	// We only check the attribute after we've added it, to facilitate
@@ -237,7 +216,6 @@ void Attributes::AddAttr(AttrPtr attr, bool is_redef)
 	     ! Find(ATTR_REDEF) )
 		{
 		auto a = make_intrusive<Attr>(ATTR_REDEF);
-		attrs_list.push_back(a.get());
 		attrs.emplace_back(std::move(a));
 		}
 
@@ -246,7 +224,6 @@ void Attributes::AddAttr(AttrPtr attr, bool is_redef)
 	     ! Find(ATTR_OPTIONAL) )
 		{
 		auto a = make_intrusive<Attr>(ATTR_OPTIONAL);
-		attrs_list.push_back(a.get());
 		attrs.emplace_back(std::move(a));
 		}
 	}
@@ -257,23 +234,6 @@ void Attributes::AddAttrs(const AttributesPtr& a, bool is_redef)
 		AddAttr(attr, is_redef);
 	}
 
-void Attributes::AddAttrs(Attributes* a, bool is_redef)
-	{
-	for ( const auto& attr : a->GetAttrs() )
-		AddAttr(attr, is_redef);
-
-	Unref(a);
-	}
-
-Attr* Attributes::FindAttr(AttrTag t) const
-	{
-	for ( const auto& a : attrs )
-		if ( a->Tag() == t )
-			return a.get();
-
-	return nullptr;
-	}
-
 const AttrPtr& Attributes::Find(AttrTag t) const
 	{
 	for ( const auto& a : attrs )
@@ -285,10 +245,6 @@ const AttrPtr& Attributes::Find(AttrTag t) const
 
 void Attributes::RemoveAttr(AttrTag t)
 	{
-	for ( int i = 0; i < attrs_list.length(); i++ )
-		if ( attrs_list[i]->Tag() == t )
-			attrs_list.remove_nth(i--);
-
 	for ( auto it = attrs.begin(); it != attrs.end(); )
 		{
 		if ( (*it)->Tag() == t )

src/Attr.h

@@ -65,9 +65,6 @@ public:
 
 	AttrTag Tag() const	{ return tag; }
 
-	[[deprecated("Remove in v4.1.  Use GetExpr().")]]
-	Expr* AttrExpr() const	{ return expr.get(); }
-
 	const ExprPtr& GetExpr() const
 		{ return expr; }
 
@@ -106,9 +103,6 @@ protected:
 // Manages a collection of attributes.
 class Attributes final : public Obj {
 public:
-	[[deprecated("Remove in v4.1.  Construct using IntrusivePtrs instead.")]]
-	Attributes(AttrPList* a, TypePtr t, bool in_record, bool is_global);
-
 	Attributes(std::vector<AttrPtr> a, TypePtr t,
 	           bool in_record, bool is_global);
 	Attributes(TypePtr t, bool in_record, bool is_global);
@@ -119,12 +113,6 @@ public:
 
 	void AddAttrs(const AttributesPtr& a, bool is_redef = false);
 
-	[[deprecated("Remove in v4.1. Pass IntrusivePtr instead.")]]
-	void AddAttrs(Attributes* a, bool is_redef = false);	// Unref's 'a' when done
-
-	[[deprecated("Remove in v4.1. Use Find().")]]
-	Attr* FindAttr(AttrTag t) const;
-
 	const AttrPtr& Find(AttrTag t) const;
 
 	void RemoveAttr(AttrTag t);
@@ -132,10 +120,6 @@ public:
 	void Describe(ODesc* d) const override;
 	void DescribeReST(ODesc* d, bool shorten = false) const;
 
-	[[deprecated("Remove in v4.1. Use GetAttrs().")]]
-	const AttrPList* Attrs() const
-		{ return &attrs_list; }
-
 	const std::vector<AttrPtr>& GetAttrs() const
 		{ return attrs; }
 
@@ -147,55 +131,9 @@ protected:
 	TypePtr type;
 	std::vector<AttrPtr> attrs;
 
-	// Remove in v4.1. This is used by Attrs(), which is deprecated.
-	AttrPList attrs_list;
 	bool in_record;
 	bool global_var;
 };
 
 } // namespace detail
 } // namespace zeek
-
-using Attr [[deprecated("Remove in v4.1. Use zeek::detail::Attr instead.")]] = zeek::detail::Attr;
-using Attributes [[deprecated("Remove in v4.1. Use zeek::detail::Attr instead.")]] = zeek::detail::Attributes;
-
-using AttrTag [[deprecated("Remove in v4.1. Use zeek::detail::AttrTag instead.")]] = zeek::detail::AttrTag;
-
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_OPTIONAL instead.")]]
-constexpr auto ATTR_OPTIONAL = zeek::detail::ATTR_OPTIONAL;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_DEFAULT instead.")]]
-constexpr auto ATTR_DEFAULT = zeek::detail::ATTR_DEFAULT;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_REDEF instead.")]]
-constexpr auto ATTR_REDEF = zeek::detail::ATTR_REDEF;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_ADD_FUNC instead.")]]
-constexpr auto ATTR_ADD_FUNC = zeek::detail::ATTR_ADD_FUNC;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_DEL_FUNC instead.")]]
-constexpr auto ATTR_DEL_FUNC = zeek::detail::ATTR_DEL_FUNC;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_FUNC instead.")]]
-constexpr auto ATTR_EXPIRE_FUNC = zeek::detail::ATTR_EXPIRE_FUNC;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_READ instead.")]]
-constexpr auto ATTR_EXPIRE_READ = zeek::detail::ATTR_EXPIRE_READ;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_WRITE instead.")]]
-constexpr auto ATTR_EXPIRE_WRITE = zeek::detail::ATTR_EXPIRE_WRITE;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_EXPIRE_CREATE instead.")]]
-constexpr auto ATTR_EXPIRE_CREATE = zeek::detail::ATTR_EXPIRE_CREATE;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_RAW_OUTPUT instead.")]]
-constexpr auto ATTR_RAW_OUTPUT = zeek::detail::ATTR_RAW_OUTPUT;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_PRIORITY instead.")]]
-constexpr auto ATTR_PRIORITY = zeek::detail::ATTR_PRIORITY;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_GROUP instead.")]]
-constexpr auto ATTR_GROUP = zeek::detail::ATTR_GROUP;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_LOG instead.")]]
-constexpr auto ATTR_LOG = zeek::detail::ATTR_LOG;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_ERROR_HANDLER instead.")]]
-constexpr auto ATTR_ERROR_HANDLER = zeek::detail::ATTR_ERROR_HANDLER;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_TYPE_COLUMN instead.")]]
-constexpr auto ATTR_TYPE_COLUMN = zeek::detail::ATTR_TYPE_COLUMN;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_TRACKED instead.")]]
-constexpr auto ATTR_TRACKED = zeek::detail::ATTR_TRACKED;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_ON_CHANGE instead.")]]
-constexpr auto ATTR_ON_CHANGE = zeek::detail::ATTR_ON_CHANGE;
-[[deprecated("Remove in v4.1. Use zeek::detail::ATTR_DEPRECATED instead.")]]
-constexpr auto ATTR_DEPRECATED = zeek::detail::ATTR_DEPRECATED;
-[[deprecated("Remove in v4.1. Use zeek::detail::NUM_ATTRS instead.")]]
-constexpr auto NUM_ATTRS = zeek::detail::NUM_ATTRS;

src/Base64.cc

@@ -284,13 +284,3 @@ String* encode_base64(const String* s, const String* a, Connection* conn)
 	}
 
 } // namespace zeek::detail
-
-zeek::String* decode_base64(const zeek::String* s, const zeek::String* a, zeek::Connection* conn)
-	{
-	return zeek::detail::decode_base64(s, a, conn);
-	}
-
-zeek::String* encode_base64(const zeek::String* s, const zeek::String* a, zeek::Connection* conn)
-	{
-	return zeek::detail::encode_base64(s ,a ,conn);
-	}

src/Base64.h

@@ -4,8 +4,6 @@
 #include <string>
 
 namespace zeek { class String; }
-using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek);
 
 namespace zeek::detail {
@@ -66,11 +64,3 @@ String* decode_base64(const String* s, const String* a = nullptr, Connection* co
 String* encode_base64(const String* s, const String* a = nullptr, Connection* conn = nullptr);
 
 } // namespace zeek::detail
-
-using Base64Converter [[deprecated("Remove in v4.1. Use zeek::detail::Base64Converter.")]] = zeek::detail::Base64Converter;
-
-// These can't be constexpr auto definitions due to the default parameters.
-[[deprecated("Remove in v4.1. Use zeek::detail::decode_base64.")]]
-zeek::String* decode_base64(const zeek::String* s, const zeek::String* a = nullptr, zeek::Connection* conn = nullptr);
-[[deprecated("Remove in v4.1. Use zeek::detail::encode_base64.")]]
-zeek::String* encode_base64(const zeek::String* s, const zeek::String* a = nullptr, zeek::Connection* conn = nullptr);

src/BifReturnVal.cc

@@ -8,8 +8,4 @@ namespace zeek::detail {
 BifReturnVal::BifReturnVal(std::nullptr_t) noexcept
 	{}
 
-BifReturnVal::BifReturnVal(Val* v) noexcept
-	: rval(AdoptRef{}, v)
-	{}
-
 } // namespace zeek::detail

src/BifReturnVal.h

@@ -27,12 +27,7 @@ public:
 
 	BifReturnVal(std::nullptr_t) noexcept;
 
-	[[deprecated("Remove in v4.1.  Return an IntrusivePtr instead.")]]
-	BifReturnVal(Val* v) noexcept;
-
 	ValPtr rval;
 };
 
 } // namespace zeek::detail
-
-using BifReturnVal [[deprecated("Remove in v4.1. Use zeek::detail::BifReturnVal.")]] = zeek::detail::BifReturnVal;

src/CCL.h

@@ -35,6 +35,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using int_list [[deprecated("Remove in v4.1. Use zeek::detail::int_list.")]] = zeek::detail::int_list;
-using CCL [[deprecated("Remove in v4.1. Use zeek::detail::CCL.")]] = zeek::detail::CCL;

src/CMakeLists.txt

@@ -210,9 +210,6 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DebugCmdConstants.h
 set_source_files_properties(nb_dns.c PROPERTIES COMPILE_FLAGS
                             -fno-strict-aliasing)
 
-set_source_files_properties(legacy-netvar-init.cc PROPERTIES COMPILE_FLAGS
-                            -Wno-deprecated-declarations)
-
 set(MAIN_SRCS
     digest.cc
     net_util.cc
@@ -296,7 +293,6 @@ set(MAIN_SRCS
     WeirdState.cc
     ZeekArgs.cc
     ZeekString.cc
-    legacy-netvar-init.cc
     bsd-getopt-long.c
     bro_inet_ntop.c
     in_cksum.cc

src/CompHash.h

@@ -25,17 +25,9 @@ public:
 	// or nullptr if it fails to typecheck.
 	std::unique_ptr<HashKey> MakeHashKey(const Val& v, bool type_check) const;
 
-	[[deprecated("Remove in v4.1.  Use MakeHashKey().")]]
-	HashKey* ComputeHash(const Val* v, bool type_check) const
-		{ return MakeHashKey(*v, type_check).release(); }
-
 	// Given a hash key, recover the values used to create it.
 	ListValPtr RecoverVals(const HashKey& k) const;
 
-	[[deprecated("Remove in v4.1.  Pass in HashKey& instead.")]]
-	ListValPtr RecoverVals(const HashKey* k) const
-		{ return RecoverVals(*k); }
-
 	unsigned int MemoryAllocation() const { return padded_sizeof(*this) + util::pad_size(size); }
 
 protected:
@@ -107,5 +99,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using CompositeHash [[deprecated("Remove in v4.1. Use zeek::detail::CompositeHash.")]] = zeek::detail::CompositeHash;

src/Conn.cc

@@ -62,8 +62,7 @@ uint64_t Connection::total_connections = 0;
 uint64_t Connection::current_connections = 0;
 
 Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t,
-                       const ConnID* id, uint32_t flow, const Packet* pkt,
+                       const ConnID* id, uint32_t flow, const Packet* pkt)
-                       const EncapsulationStack* arg_encap)
 	{
 	sessions = s;
 	key = k;
@@ -117,22 +116,9 @@ Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t,
 	++current_connections;
 	++total_connections;
 
-	if ( arg_encap )
+	encapsulation = pkt->encap;
-		encapsulation = std::make_unique<EncapsulationStack>(*arg_encap);
-	else
-		encapsulation = nullptr;
 	}
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-Connection::Connection(NetSessions* s, const detail::ConnIDKey& k, double t,
-                       const ConnID* id, uint32_t flow, const Packet* pkt)
-	: Connection(s, k, t, id, flow, pkt, pkt->encap.get())
-	{
-	}
-#pragma GCC diagnostic pop
-
-
 Connection::~Connection()
 	{
 	if ( ! finished )
@@ -342,11 +328,6 @@ void Connection::StatusUpdateTimer(double t)
 	          detail::TIMER_CONN_STATUS_UPDATE);
 	}
 
-RecordVal* Connection::BuildConnVal()
-	{
-	return ConnVal()->Ref()->AsRecordVal();
-	}
-
 const RecordValPtr& Connection::ConnVal()
 	{
 	if ( ! conn_val )
@@ -477,55 +458,6 @@ void Connection::Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, const ch
 		EnqueueEvent(f, analyzer, ConnVal());
 	}
 
-void Connection::Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, Val* v1, Val* v2)
-	{
-	if ( ! f )
-		{
-		Unref(v1);
-		Unref(v2);
-		return;
-		}
-
-	if ( v2 )
-		EnqueueEvent(f, analyzer,
-		             ConnVal(),
-		             IntrusivePtr{AdoptRef{}, v1},
-		             IntrusivePtr{AdoptRef{}, v2});
-	else
-		EnqueueEvent(f, analyzer,
-		             ConnVal(),
-		             IntrusivePtr{AdoptRef{}, v1});
-	}
-
-void Connection::ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* a, ValPList vl)
-	{
-	auto args = val_list_to_args(vl);
-
-	if ( ! f )
-		// This may actually happen if there is no local handler
-		// and a previously existing remote handler went away.
-		return;
-
-	// "this" is passed as a cookie for the event
-	event_mgr.Enqueue(f, std::move(args), util::detail::SOURCE_LOCAL, a ? a->GetID() : 0, this);
-	}
-
-void Connection::ConnectionEventFast(EventHandlerPtr f, analyzer::Analyzer* a, ValPList vl)
-	{
-	// "this" is passed as a cookie for the event
-	event_mgr.Enqueue(f, val_list_to_args(vl), util::detail::SOURCE_LOCAL,
-	                        a ? a->GetID() : 0, this);
-	}
-
-void Connection::ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* a, ValPList* vl)
-	{
-	auto args = val_list_to_args(*vl);
-	delete vl;
-
-	if ( f )
-		EnqueueEvent(f, a, std::move(args));
-	}
-
 void Connection::EnqueueEvent(EventHandlerPtr f, analyzer::Analyzer* a,
                               Args args)
 	{

src/Conn.h

@@ -64,9 +64,6 @@ static inline int addr_port_canon_lt(const IPAddr& addr1, uint32_t p1,
 class Connection final : public Obj {
 public:
 
-	[[deprecated("Remove in v4.1. Store encapsulation in the packet and use the other version of the constructor instead.")]]
-	Connection(NetSessions* s, const detail::ConnIDKey& k, double t, const ConnID* id,
-	           uint32_t flow, const Packet* pkt, const EncapsulationStack* arg_encap);
 	Connection(NetSessions* s, const detail::ConnIDKey& k, double t, const ConnID* id,
 	           uint32_t flow, const Packet* pkt);
 	~Connection() override;
@@ -166,9 +163,6 @@ public:
 	// Activate connection_status_update timer.
 	void EnableStatusUpdateTimer();
 
-	[[deprecated("Remove in v4.1.  Use ConnVal() instead.")]]
-	RecordVal* BuildConnVal();
-
 	/**
 	 * Returns the associated "connection" record.
 	 */
@@ -190,38 +184,6 @@ public:
 	// argument is the connection value.
 	void Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, const char* name = nullptr);
 
-	// If a handler exists for 'f', an event will be generated.  In any case,
-	// 'v1' and 'v2' reference counts get decremented.  The event's first
-	// argument is the connection value, second argument is 'v1', and if 'v2'
-	// is given that will be it's third argument.
-	[[deprecated("Remove in v4.1.  Use EnqueueEvent() instead (note it doesn't automatically add the connection argument).")]]
-	void Event(EventHandlerPtr f, analyzer::Analyzer* analyzer, Val* v1, Val* v2 = nullptr);
-
-	// If a handler exists for 'f', an event will be generated.  In any case,
-	// reference count for each element in the 'vl' list are decremented.  The
-	// arguments used for the event are whatevever is provided in 'vl'.
-	[[deprecated("Remove in v4.1.  Use EnqueueEvent() instead.")]]
-	void ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* analyzer, ValPList vl);
-
-	// Same as ConnectionEvent, except taking the event's argument list via a
-	// pointer instead of by value.  This function takes ownership of the
-	// memory pointed to by 'vl' and also for decrementing the reference count
-	// of each of its elements.
-	[[deprecated("Remove in v4.1.  Use EnqueueEvent() instead.")]]
-	void ConnectionEvent(EventHandlerPtr f, analyzer::Analyzer* analyzer, ValPList* vl);
-
-	// Queues an event without first checking if there's any available event
-	// handlers (or remote consumes).  If it turns out there's actually nothing
-	// that will consume the event, then this may leak memory due to failing to
-	// decrement the reference count of each element in 'vl'.  i.e. use this
-	// function instead of ConnectionEvent() if you've already guarded against
-	// the case where there's no handlers (one usually also does that because
-	// it would be a waste of effort to construct all the event arguments when
-	// there's no handlers to consume them).
-	[[deprecated("Remove in v4.1.  Use EnqueueEvent() instead.")]]
-	void ConnectionEventFast(zeek::EventHandlerPtr f, zeek::analyzer::Analyzer* analyzer,
-	                         ValPList vl);
-
 	/**
 	 * Enqueues an event associated with this connection and given analyzer.
 	 */
@@ -406,15 +368,5 @@ protected:
 } // namespace detail
 } // namespace zeek
 
-using ConnEventToFlag [[deprecated("Remove in v4.1. Use zeek::ConnEventToFlag.")]] = zeek::ConnEventToFlag;
-constexpr auto NUL_IN_LINE [[deprecated("Remove in v4.1. Use zeek::NUL_IN_LINE.")]] = zeek::NUL_IN_LINE;
-constexpr auto SINGULAR_CR [[deprecated("Remove in v4.1. Use zeek::SINGULAR_CR.")]] = zeek::SINGULAR_CR;
-constexpr auto SINGULAR_LF [[deprecated("Remove in v4.1. Use zeek::SINGULAR_LF.")]] = zeek::SINGULAR_LF;
-constexpr auto NUM_EVENTS_TO_FLAG [[deprecated("Remove in v4.1. Use zeek::NUM_EVENTS_TO_FLAG.")]] = zeek::NUM_EVENTS_TO_FLAG;
-
-using ConnID [[deprecated("Remove in v4.1. Use zeek::ConnID.")]] = zeek::ConnID;
-using Connection [[deprecated("Remove in v4.1. Use zeek::Connection.")]] = zeek::Connection;
-using ConnectionTimer [[deprecated("Remove in v4.1. Use zeek::detail::ConnectionTimer.")]] = zeek::detail::ConnectionTimer;
-
 #define ADD_TIMER(timer, t, do_expire, type) \
 	AddTimer(timer_func(timer), (t), (do_expire), (type))

src/DFA.h

@@ -152,8 +152,3 @@ inline DFA_State* DFA_State::Xtion(int sym, DFA_Machine* machine)
 	}
 
 } // namespace zeek::detail
-
-using DFA_State [[deprecated("Remove in v4.1. Use zeek::detail::DFA_State.")]] = zeek::detail::DFA_State;
-using DigestStr [[deprecated("Remove in v4.1. Use zeek::detail::DigestStr.")]] = zeek::detail::DigestStr;
-using DFA_State_Cache [[deprecated("Remove in v4.1. Use zeek::detail::DFA_State_Cache.")]] = zeek::detail::DFA_State_Cache;
-using DFA_Machine [[deprecated("Remove in v4.1. Use zeek::detail::DFA_Machine.")]] = zeek::detail::DFA_Machine;

src/DNS_Mgr.h

@@ -244,12 +244,3 @@ protected:
 extern DNS_Mgr* dns_mgr;
 
 } // namespace zeek::detail
-
-using DNS_Mgr [[deprecated("Remove in v4.1. Use zeek::detail::DNS_Mgr.")]] = zeek::detail::DNS_Mgr;
-extern zeek::detail::DNS_Mgr*& dns_mgr [[deprecated("Remove in v4.1. Use zeek::detail::dns_mgr.")]];
-
-using DNS_MgrMode [[deprecated("Remove in v4.1. Use zeek::detail::DNS_MgrMode.")]] = zeek::detail::DNS_MgrMode;
-constexpr auto DNS_PRIME [[deprecated("Remove in v4.1. Use zeek::detail::DNS_PRIME.")]] = zeek::detail::DNS_PRIME;
-constexpr auto DNS_FORCE [[deprecated("Remove in v4.1. Use zeek::detail::DNS_FORCE.")]] = zeek::detail::DNS_FORCE;
-constexpr auto DNS_DEFAULT [[deprecated("Remove in v4.1. Use zeek::detail::DNS_DEFAULT.")]] = zeek::detail::DNS_DEFAULT;
-constexpr auto DNS_FAKE [[deprecated("Remove in v4.1. Use zeek::detail::DNS_FAKE.")]] = zeek::detail::DNS_FAKE;

src/DbgBreakpoint.h

@@ -84,13 +84,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using DbgBreakPoint [[deprecated("Remove in v4.1. Use zeek::detail::DbgBreakpoint.")]] = zeek::detail::DbgBreakpoint;
-
-using BreakCode [[deprecated("Remove in v4.1. Use zeek::detail::BreakCode.")]] = zeek::detail::BreakCode;
-[[deprecated("Remove in v4.1. Use zeek::detail::BC_NO_HIT.")]]
-constexpr auto bcNoHit = zeek::detail::BC_NO_HIT;
-[[deprecated("Remove in v4.1. Use zeek::detail::BC_HIT.")]]
-constexpr auto bcHit = zeek::detail::BC_HIT;
-[[deprecated("Remove in v4.1. Use zeek::detail::BC_HIT_AND_DELETE.")]]
-constexpr auto bcHitAndDelete = zeek::detail::BC_HIT_AND_DELETE;

src/DbgDisplay.h

@@ -27,5 +27,3 @@ protected:
 	};
 
 } // namespace zeek::detail
-
-using DbgDisplay [[deprecated("Remove in v4.1. Use zeek::detail::DbgDisplay.")]] = zeek::detail::DbgDisplay;

src/DbgWatch.h

@@ -6,7 +6,6 @@
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
 namespace zeek { class Obj; }
-using BroObj [[deprecated("Remove in v4.1. Use zeek:Obj instead.")]] = zeek::Obj;
 
 namespace zeek::detail {
 
@@ -22,5 +21,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using DbgWatch [[deprecated("Remove in v4.1. Using zeek::detail::DbgWatch.")]] = zeek::detail::DbgWatch;

src/Debug.cc

@@ -41,16 +41,9 @@ extern "C" {
 using namespace std;
 
 bool zeek::detail::g_policy_debug = false;
-bool& g_policy_debug = zeek::detail::g_policy_debug;
-
 zeek::detail::DebuggerState zeek::detail::g_debugger_state;
-zeek::detail::DebuggerState& g_debugger_state = zeek::detail::g_debugger_state;
-
 zeek::detail::TraceState zeek::detail::g_trace_state;
-zeek::detail::TraceState& g_trace_state = zeek::detail::g_trace_state;
-
 std::map<string, zeek::detail::Filemap*> zeek::detail::g_dbgfilemaps;
-std::map<string, zeek::detail::Filemap*>& g_dbgfilemaps = zeek::detail::g_dbgfilemaps;
 
 // These variables are used only to decide whether or not to print the
 // current context; you don't want to do it after a step or next

src/Debug.h

@@ -178,32 +178,3 @@ int debug_msg(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));
 
 } // namespace detail
 } // namespace zeek
-
-constexpr auto plrUnknown [[deprecated("Remove in v4.1. Use zeek::detail::PLR_UNKNOWN.")]] = zeek::detail::PLR_UNKNOWN;
-constexpr auto plrFileAndLine [[deprecated("Remove in v4.1. Use zeek::detail::PLR_FILE_AND_LINE.")]] = zeek::detail::PLR_FILE_AND_LINE;
-constexpr auto plrFunction [[deprecated("Remove in v4.1. Use zeek::detail::PLR_FUNCTION.")]] = zeek::detail::PLR_FUNCTION;
-using ParseLocationRec [[deprecated("Remove in v4.1. Use zeek::detail::ParseLocationRec.")]] = zeek::detail::ParseLocationRec;
-using Filemap [[deprecated("Remove in v4.1. Use zeek::detail::Filemap.")]] = zeek::detail::Filemap;
-using BPIDMapType [[deprecated("Remove in v4.1. Use zeek::detail::BPIDMapType.")]] = zeek::detail::BPIDMapType;
-using BPMapType [[deprecated("Remove in v4.1. Use zeek::detail::BPMapType.")]] = zeek::detail::BPMapType;
-using TraceState [[deprecated("Remove in v4.1. Use zeek::detail::TraceState.")]] = zeek::detail::TraceState;
-using DebuggerState [[deprecated("Remove in v4.1. Use zeek::detail::DebuggerState.")]] = zeek::detail::DebuggerState;
-using StmtLocMapping [[deprecated("Remove in v4.1. Use zeek::detail::StmtLocMapping.")]] = zeek::detail::StmtLocMapping;
-
-constexpr auto parse_location_string [[deprecated("Remove in v4.1. Use zeek::detail::parse_location_string.")]] = zeek::detail::parse_location_string;
-constexpr auto pre_execute_stmt [[deprecated("Remove in v4.1. Use zeek::detail::pre_execute_stmt.")]] = zeek::detail::pre_execute_stmt;
-constexpr auto post_execute_stmt [[deprecated("Remove in v4.1. Use zeek::detail::post_execute_stmt.")]] = zeek::detail::post_execute_stmt;
-constexpr auto dbg_init_debugger [[deprecated("Remove in v4.1. Use zeek::detail::dbg_init_debugger.")]] = zeek::detail::dbg_init_debugger;
-constexpr auto dbg_shutdown_debugger [[deprecated("Remove in v4.1. Use zeek::detail::dbg_shutdown_debugger.")]] = zeek::detail::dbg_shutdown_debugger;
-constexpr auto dbg_handle_debug_input [[deprecated("Remove in v4.1. Use zeek::detail::dbg_handle_debug_input.")]] = zeek::detail::dbg_handle_debug_input;
-constexpr auto dbg_execute_command [[deprecated("Remove in v4.1. Use zeek::detail::dbg_execute_command.")]] = zeek::detail::dbg_execute_command;
-constexpr auto dbg_eval_expr [[deprecated("Remove in v4.1. Use zeek::detail::dbg_eval_expr.")]] = zeek::detail::dbg_eval_expr;
-constexpr auto get_context_description [[deprecated("Remove in v4.1. Use zeek::detail::get_context_description.")]] = zeek::detail::get_context_description;
-constexpr auto debug_msg [[deprecated("Remove in v4.1. Use zeek::detail::debug_msg.")]] = zeek::detail::debug_msg;
-
-extern bool& g_policy_debug [[deprecated("Remove in v4.1. Use zeek::detail:g_policy_debug")]];
-extern zeek::detail::DebuggerState& g_debugger_state [[deprecated("Remove in v4.1. Use zeek::detail:g_debugger_state")]];
-extern std::string& current_module [[deprecated("Remove in v4.1. Use zeek::current_module.")]];
-extern zeek::detail::TraceState& g_trace_state [[deprecated("Remove in v4.1. Use zeek::detail::g_trace_state.")]];
-extern zeek::detail::Frame*& g_dbg_locals [[deprecated("Remove in v4.1. Use zeek::detail::g_dbg_locals.")]];
-extern std::map<std::string, zeek::detail::Filemap*>& g_dbgfilemaps [[deprecated("Remove in v4.1. Use zeek::detail::g_dbgfilemaps.")]];

src/DebugCmds.h

@@ -80,21 +80,3 @@ DbgCmdFn dbg_cmd_list;
 DbgCmdFn dbg_cmd_trace;
 
 } // namespace zeek::detail
-
-using DebugCmdInfo [[deprecated("Remove in v4.1. Use zeek::detail::DebugCmdInfo.")]] = zeek::detail::DebugCmdInfo;
-constexpr auto init_global_dbg_constants [[deprecated("Remove in v4.1. Use zeek::detail::init_global_dbg_constants.")]] = zeek::detail::init_global_dbg_constants;
-constexpr auto get_debug_cmd_info [[deprecated("Remove in v4.1. Use zeek::detail::get_debug_cmd_info.")]] = zeek::detail::get_debug_cmd_info;
-constexpr auto find_all_matching_cmds [[deprecated("Remove in v4.1. Use zeek::detail::find_all_matching_cmds.")]] = zeek::detail::find_all_matching_cmds;
-
-constexpr auto dbg_cmd_backtrace [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_backtrace")]] = zeek::detail::dbg_cmd_backtrace;
-constexpr auto dbg_cmd_frame [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_frame")]] = zeek::detail::dbg_cmd_frame;
-constexpr auto dbg_cmd_help [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_help")]] = zeek::detail::dbg_cmd_help;
-constexpr auto dbg_cmd_break [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_break")]] = zeek::detail::dbg_cmd_break;
-constexpr auto dbg_cmd_break_condition [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_break_condition")]] = zeek::detail::dbg_cmd_break_condition;
-constexpr auto dbg_cmd_break_set_state [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_break_set_state")]] = zeek::detail::dbg_cmd_break_set_state;
-constexpr auto dbg_cmd_print [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_print")]] = zeek::detail::dbg_cmd_print;
-constexpr auto dbg_cmd_info [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_info")]] = zeek::detail::dbg_cmd_info;
-constexpr auto dbg_cmd_list [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_list")]] = zeek::detail::dbg_cmd_list;
-constexpr auto dbg_cmd_trace [[deprecated("Remove in v4.1. Use zeek::detail::dbg_cmd_trace")]] = zeek::detail::dbg_cmd_trace;
-
-extern zeek::PQueue<zeek::detail::DebugCmdInfo>& g_DebugCmdInfos [[deprecated("Remove in v4.1. Use zeek::detail::g_DebugCmdInfos.")]];

src/DebugLogger.h

@@ -106,29 +106,6 @@ extern DebugLogger debug_logger;
 } // namespace detail
 } // namespace zeek
 
-using DebugLogger [[deprecated("Remove in v4.1. Use zeek::detail::DebugLogger.")]] = zeek::detail::DebugLogger;
-
-using DebugStream [[deprecated("Remove in v4.1. Use zeek::DebugStream.")]] = zeek::DebugStream;
-constexpr auto DBG_SERIAL [[deprecated("Remove in v4.1. Use zeek::DBG_SERIAL.")]] = zeek::DBG_SERIAL;
-constexpr auto DBG_RULES [[deprecated("Remove in v4.1. Use zeek::DBG_RULES.")]] = zeek::DBG_RULES;
-constexpr auto DBG_STRING [[deprecated("Remove in v4.1. Use zeek::DBG_STRING.")]] = zeek::DBG_STRING;
-constexpr auto DBG_NOTIFIERS [[deprecated("Remove in v4.1. Use zeek::DBG_NOTIFIERS.")]] = zeek::DBG_NOTIFIERS;
-constexpr auto DBG_MAINLOOP [[deprecated("Remove in v4.1. Use zeek::DBG_MAINLOOP.")]] = zeek::DBG_MAINLOOP;
-constexpr auto DBG_ANALYZER [[deprecated("Remove in v4.1. Use zeek::DBG_ANALYZER.")]] = zeek::DBG_ANALYZER;
-constexpr auto DBG_TM [[deprecated("Remove in v4.1. Use zeek::DBG_TM.")]] = zeek::DBG_TM;
-constexpr auto DBG_LOGGING [[deprecated("Remove in v4.1. Use zeek::DBG_LOGGING.")]] = zeek::DBG_LOGGING;
-constexpr auto DBG_INPUT [[deprecated("Remove in v4.1. Use zeek::DBG_INPUT.")]] = zeek::DBG_INPUT;
-constexpr auto DBG_THREADING [[deprecated("Remove in v4.1. Use zeek::DBG_THREADING.")]] = zeek::DBG_THREADING;
-constexpr auto DBG_FILE_ANALYSIS [[deprecated("Remove in v4.1. Use zeek::DBG_FILE_ANALYSIS.")]] = zeek::DBG_FILE_ANALYSIS;
-constexpr auto DBG_PLUGINS [[deprecated("Remove in v4.1. Use zeek::DBG_PLUGINS.")]] = zeek::DBG_PLUGINS;
-constexpr auto DBG_ZEEKYGEN [[deprecated("Remove in v4.1. Use zeek::DBG_ZEEKYGEN.")]] = zeek::DBG_ZEEKYGEN;
-constexpr auto DBG_PKTIO [[deprecated("Remove in v4.1. Use zeek::DBG_PKTIO.")]] = zeek::DBG_PKTIO;
-constexpr auto DBG_BROKER [[deprecated("Remove in v4.1. Use zeek::DBG_BROKER.")]] = zeek::DBG_BROKER;
-constexpr auto DBG_SCRIPTS [[deprecated("Remove in v4.1. Use zeek::DBG_SCRIPTS.")]] = zeek::DBG_SCRIPTS;
-constexpr auto DBG_SUPERVISOR [[deprecated("Remove in v4.1. Use zeek::DBG_SUPERVISOR.")]] = zeek::DBG_SUPERVISOR;
-
-extern zeek::detail::DebugLogger& debug_logger;
-
 #else
 #define DBG_LOG(args...)
 #define DBG_LOG_VERBOSE(args...)

src/Desc.h

@@ -218,16 +218,3 @@ class Obj;
 extern std::string obj_desc(const Obj* o);
 
 } // namespace zeek
-
-using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
-
-using ODesc [[deprecated("Remove in v4.1. Use zeek::ODesc.")]] = zeek::ODesc;
-using desc_type [[deprecated("Remove in v4.1. Use zeek::DescType.")]] = zeek::DescType;
-constexpr auto DESC_READABLE [[deprecated("Remove in v4.1. Use zeek::DESC_READABLE.")]] = zeek::DESC_READABLE;
-constexpr auto DESC_PORTABLE [[deprecated("Remove in v4.1. Use zeek::DESC_PORTABLE.")]] = zeek::DESC_PORTABLE;
-constexpr auto DESC_BINARY [[deprecated("Remove in v4.1. Use zeek::DESC_BINARY.")]] = zeek::DESC_BINARY;
-
-using desc_style [[deprecated("Remove in v4.1. Use zeek::DescStyle.")]] = zeek::DescStyle;
-constexpr auto STANDARD_STYLE [[deprecated("Remove in v4.1. Use zeek::STANDARD_STYLE.")]] = zeek::STANDARD_STYLE;
-constexpr auto RAW_STYLE [[deprecated("Remove in v4.1. Use zeek::RAW_STYLE.")]] = zeek::RAW_STYLE;

src/Dict.h

@@ -551,6 +551,3 @@ public:
 };
 
 } // namespace zeek
-
-using Dictionary [[deprecated("Remove in v4.1. Use zeek::Dictionary instead.")]] = zeek::Dictionary;
-template<typename T> using PDict [[deprecated("Remove in v4.1. Use zeek::PDict instead.")]] = zeek::PDict<T>;

src/Event.cc

@@ -94,34 +94,6 @@ EventMgr::~EventMgr()
 	Unref(src_val);
 	}
 
-void EventMgr::QueueEventFast(const EventHandlerPtr &h, ValPList vl,
-                              util::detail::SourceID src, analyzer::ID aid, detail::TimerMgr* mgr,
-                              Obj* obj)
-	{
-	QueueEvent(new Event(h, val_list_to_args(vl), src, aid, obj));
-	}
-
-void EventMgr::QueueEvent(const EventHandlerPtr &h, ValPList vl,
-                          util::detail::SourceID src, analyzer::ID aid,
-                          detail::TimerMgr* mgr, Obj* obj)
-	{
-	auto args = val_list_to_args(vl);
-
-	if ( h )
-		Enqueue(h, std::move(args), src, aid, obj);
-	}
-
-void EventMgr::QueueEvent(const EventHandlerPtr &h, ValPList* vl,
-                          util::detail::SourceID src, analyzer::ID aid,
-                          detail::TimerMgr* mgr, Obj* obj)
-	{
-	auto args = val_list_to_args(*vl);
-	delete vl;
-
-	if ( h )
-		Enqueue(h, std::move(args), src, aid, obj);
-	}
-
 void EventMgr::Enqueue(const EventHandlerPtr& h, Args vl,
                        util::detail::SourceID src,
                        analyzer::ID aid, Obj* obj)

src/Event.h

@@ -52,39 +52,6 @@ public:
 	EventMgr();
 	~EventMgr() override;
 
-	// Queues an event without first checking if there's any available event
-	// handlers (or remote consumers).  If it turns out there's actually
-	// nothing that will consume the event, then this may leak memory due to
-	// failing to decrement the reference count of each element in 'vl'.  i.e.
-	// use this function instead of QueueEvent() if you've already guarded
-	// against the case where there's no handlers (one usually also does that
-	// because it would be a waste of effort to construct all the event
-	// arguments when there's no handlers to consume them).
-	[[deprecated("Remove in v4.1.  Use Enqueue() instead.")]]
-	void QueueEventFast(const EventHandlerPtr &h, ValPList vl,
-	                    util::detail::SourceID src = util::detail::SOURCE_LOCAL, analyzer::ID aid = 0,
-	                    detail::TimerMgr* mgr = nullptr, Obj* obj = nullptr);
-
-	// Queues an event if there's an event handler (or remote consumer).  This
-	// function always takes ownership of decrementing the reference count of
-	// each element of 'vl', even if there's no event handler.  If you've
-	// checked for event handler existence, you may wish to call
-	// QueueEventFast() instead of this function to prevent the redundant
-	// existence check.
-	[[deprecated("Remove in v4.1.  Use Enqueue() instead.")]]
-	void QueueEvent(const EventHandlerPtr &h, ValPList vl,
-	                util::detail::SourceID src = util::detail::SOURCE_LOCAL, analyzer::ID aid = 0,
-	                detail::TimerMgr* mgr = nullptr, Obj* obj = nullptr);
-
-	// Same as QueueEvent, except taking the event's argument list via a
-	// pointer instead of by value.  This function takes ownership of the
-	// memory pointed to by 'vl' as well as decrementing the reference count of
-	// each of its elements.
-	[[deprecated("Remove in v4.1.  Use Enqueue() instead.")]]
-	void QueueEvent(const EventHandlerPtr &h, ValPList* vl,
-	                util::detail::SourceID src = util::detail::SOURCE_LOCAL, analyzer::ID aid = 0,
-	                detail::TimerMgr* mgr = nullptr, Obj* obj = nullptr);
-
 	/**
 	 * Adds an event to the queue.  If no handler is found for the event
 	 * when later going to call it, nothing happens except for having
@@ -153,10 +120,3 @@ protected:
 extern EventMgr event_mgr;
 
 } // namespace zeek
-
-using Event [[deprecated("Remove in v4.1. Use zeek::Event.")]] = zeek::Event;
-using EventMgr [[deprecated("Remove in v4.1. Use zeek::EventMgr.")]] = zeek::EventMgr;
-extern zeek::EventMgr& mgr [[deprecated("Remove in v4.1. Use zeek::event_mgr")]];
-
-extern uint64_t& num_events_queued [[deprecated("Remove in v4.1. Use zeek::event_mgr.num_events_queued")]];
-extern uint64_t& num_events_dispatched [[deprecated("Remove in v4.1. Use zeek::event_mgr.num_events_dispatched")]];

src/EventHandler.cc

@@ -50,9 +50,6 @@ const FuncTypePtr& EventHandler::GetType(bool check_export)
 void EventHandler::SetFunc(FuncPtr f)
 	{ local = std::move(f); }
 
-void EventHandler::SetLocalHandler(Func* f)
-	{ SetFunc({NewRef{}, f}); }
-
 void EventHandler::Call(Args* vl, bool no_remote)
 	{
 #ifdef PROFILE_BRO_FUNCTIONS

src/EventHandler.h

@@ -23,20 +23,10 @@ public:
 	const FuncPtr& GetFunc()
 		{ return local; }
 
-	[[deprecated("Remove in v4.1.  Use GetFunc().")]]
-	Func* LocalHandler()	{ return local.get(); }
-
 	const FuncTypePtr& GetType(bool check_export = true);
 
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	FuncType* FType(bool check_export = true)
-		{ return GetType().get(); }
-
 	void SetFunc(FuncPtr f);
 
-	[[deprecated("Remove in v4.1.  Use SetFunc().")]]
-	void SetLocalHandler(Func* f);
-
 	void AutoPublish(std::string topic)
 		{
 		auto_publish.insert(std::move(topic));
@@ -106,6 +96,3 @@ private:
 };
 
 } // namespace zeek
-
-using EventHandler [[deprecated("Remove in v4.1. Use zeek::EventHandler.")]] = zeek::EventHandler;
-using EventHandlerPtr [[deprecated("Remove in v4.1. Use zeek::EventHandlerPtr.")]] = zeek::EventHandlerPtr;

src/EventRegistry.h

@@ -58,6 +58,3 @@ private:
 extern EventRegistry* event_registry;
 
 } // namespace zeek
-
-using EventRegistry [[deprecated("Remove in v4.1. Use zeek::EventRegistry.")]] = zeek::EventRegistry;
-extern zeek::EventRegistry*& event_registry;

src/Expr.h

@@ -21,14 +21,12 @@
 ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Scope, zeek::detail);
 
-namespace zeek::detail { struct function_ingredients; }
-using function_ingredients [[deprecated("Remove in v4.1. Use zeek::detail::function_ingredients.")]] = zeek::detail::function_ingredients;
-
 namespace zeek {
 template <class T> class IntrusivePtr;
 
 namespace detail {
 
+struct function_ingredients;
 using IDPtr = IntrusivePtr<ID>;
 
 enum BroExprTag : int {
@@ -109,9 +107,6 @@ using StmtPtr = IntrusivePtr<Stmt>;
 
 class Expr : public Obj {
 public:
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	zeek::Type* Type() const		{ return type.get(); }
-
 	const TypePtr& GetType() const
 		{ return type; }
 
@@ -1053,9 +1048,6 @@ public:
 	                     TypePtr arg_type = nullptr,
 	                     AttributesPtr arg_attrs = nullptr);
 
-	[[deprecated("Remove in v4.1.  Use GetAttrs().")]]
-	Attributes* Attrs() { return attrs.get(); }
-
 	const AttributesPtr& GetAttrs() const
 		{ return attrs; }
 
@@ -1083,9 +1075,6 @@ public:
 	                   TypePtr arg_type = nullptr,
 			   AttributesPtr arg_attrs = nullptr);
 
-	[[deprecated("Remove in v4.1.  Use GetAttrs().")]]
-	Attributes* Attrs() { return attrs.get(); }
-
 	const AttributesPtr& GetAttrs() const
 		{ return attrs; }
 
@@ -1641,53 +1630,3 @@ inline bool is_vector(const ExprPtr& e)	{ return is_vector(e.get()); }
 
 } // namespace detail
 } // namespace zeek
-
-using Expr [[deprecated("Remove in v4.1. Use zeek::detail::Expr instead.")]] = zeek::detail::Expr;
-using NameExpr [[deprecated("Remove in v4.1. Use zeek::detail::NameExpr instead.")]] = zeek::detail::NameExpr;
-using ConstExpr [[deprecated("Remove in v4.1. Use zeek::detail::ConstExpr instead.")]] = zeek::detail::ConstExpr;
-using UnaryExpr [[deprecated("Remove in v4.1. Use zeek::detail::UnaryExpr instead.")]] = zeek::detail::UnaryExpr;
-using BinaryExpr [[deprecated("Remove in v4.1. Use zeek::detail::BinaryExpr instead.")]] = zeek::detail::BinaryExpr;
-using CloneExpr [[deprecated("Remove in v4.1. Use zeek::detail::CloneExpr instead.")]] = zeek::detail::CloneExpr;
-using IncrExpr [[deprecated("Remove in v4.1. Use zeek::detail::IncrExpr instead.")]] = zeek::detail::IncrExpr;
-using ComplementExpr [[deprecated("Remove in v4.1. Use zeek::detail::ComplementExpr instead.")]] = zeek::detail::ComplementExpr;
-using NotExpr [[deprecated("Remove in v4.1. Use zeek::detail::NotExpr instead.")]] = zeek::detail::NotExpr;
-using PosExpr [[deprecated("Remove in v4.1. Use zeek::detail::PosExpr instead.")]] = zeek::detail::PosExpr;
-using NegExpr [[deprecated("Remove in v4.1. Use zeek::detail::NegExpr instead.")]] = zeek::detail::NegExpr;
-using SizeExpr [[deprecated("Remove in v4.1. Use zeek::detail::SizeExpr instead.")]] = zeek::detail::SizeExpr;
-using AddExpr [[deprecated("Remove in v4.1. Use zeek::detail::AddExpr instead.")]] = zeek::detail::AddExpr;
-using AddToExpr [[deprecated("Remove in v4.1. Use zeek::detail::AddToExpr instead.")]] = zeek::detail::AddToExpr;
-using RemoveFromExpr [[deprecated("Remove in v4.1. Use zeek::detail::RemoveFromExpr instead.")]] = zeek::detail::RemoveFromExpr;
-using SubExpr [[deprecated("Remove in v4.1. Use zeek::detail::SubExpr instead.")]] = zeek::detail::SubExpr;
-using TimesExpr [[deprecated("Remove in v4.1. Use zeek::detail::TimesExpr instead.")]] = zeek::detail::TimesExpr;
-using DivideExpr [[deprecated("Remove in v4.1. Use zeek::detail::DivideExpr instead.")]] = zeek::detail::DivideExpr;
-using ModExpr [[deprecated("Remove in v4.1. Use zeek::detail::ModExpr instead.")]] = zeek::detail::ModExpr;
-using BoolExpr [[deprecated("Remove in v4.1. Use zeek::detail::BoolExpr instead.")]] = zeek::detail::BoolExpr;
-using BitExpr [[deprecated("Remove in v4.1. Use zeek::detail::BitExpr instead.")]] = zeek::detail::BitExpr;
-using EqExpr [[deprecated("Remove in v4.1. Use zeek::detail::EqExpr instead.")]] = zeek::detail::EqExpr;
-using RelExpr [[deprecated("Remove in v4.1. Use zeek::detail::RelExpr instead.")]] = zeek::detail::RelExpr;
-using CondExpr [[deprecated("Remove in v4.1. Use zeek::detail::CondExpr instead.")]] = zeek::detail::CondExpr;
-using RefExpr [[deprecated("Remove in v4.1. Use zeek::detail::RefExpr instead.")]] = zeek::detail::RefExpr;
-using AssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::AssignExpr instead.")]] = zeek::detail::AssignExpr;
-using IndexSliceAssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::IndexSliceAssignExpr instead.")]] = zeek::detail::IndexSliceAssignExpr;
-using IndexExpr [[deprecated("Remove in v4.1. Use zeek::detail::IndexExpr instead.")]] = zeek::detail::IndexExpr;
-using FieldExpr [[deprecated("Remove in v4.1. Use zeek::detail::FieldExpr instead.")]] = zeek::detail::FieldExpr;
-using HasFieldExpr [[deprecated("Remove in v4.1. Use zeek::detail::HasFieldExpr instead.")]] = zeek::detail::HasFieldExpr;
-using RecordConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::RecordConstructorExpr instead.")]] = zeek::detail::RecordConstructorExpr;
-using TableConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::TableConstructorExpr instead.")]] = zeek::detail::TableConstructorExpr;
-using SetConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::SetConstructorExpr instead.")]] = zeek::detail::SetConstructorExpr;
-using VectorConstructorExpr [[deprecated("Remove in v4.1. Use zeek::detail::VectorConstructorExpr instead.")]] = zeek::detail::VectorConstructorExpr;
-using FieldAssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::FieldAssignExpr instead.")]] = zeek::detail::FieldAssignExpr;
-using ArithCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::ArithCoerceExpr instead.")]] = zeek::detail::ArithCoerceExpr;
-using RecordCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::RecordCoerceExpr instead.")]] = zeek::detail::RecordCoerceExpr;
-using TableCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::TableCoerceExpr instead.")]] = zeek::detail::TableCoerceExpr;
-using VectorCoerceExpr [[deprecated("Remove in v4.1. Use zeek::detail::VectorCoerceExpr instead.")]] = zeek::detail::VectorCoerceExpr;
-using ScheduleTimer [[deprecated("Remove in v4.1. Use zeek::detail::ScheduleTimer instead.")]] = zeek::detail::ScheduleTimer;
-using ScheduleExpr [[deprecated("Remove in v4.1. Use zeek::detail::ScheduleExpr instead.")]] = zeek::detail::ScheduleExpr;
-using InExpr [[deprecated("Remove in v4.1. Use zeek::detail::InExpr instead.")]] = zeek::detail::InExpr;
-using CallExpr [[deprecated("Remove in v4.1. Use zeek::detail::CallExpr instead.")]] = zeek::detail::CallExpr;
-using LambdaExpr [[deprecated("Remove in v4.1. Use zeek::detail::LambdaExpr instead.")]] = zeek::detail::LambdaExpr;
-using EventExpr [[deprecated("Remove in v4.1. Use zeek::detail::EventExpr instead.")]] = zeek::detail::EventExpr;
-using ListExpr [[deprecated("Remove in v4.1. Use zeek::detail::ListExpr instead.")]] = zeek::detail::ListExpr;
-using RecordAssignExpr [[deprecated("Remove in v4.1. Use zeek::detail::RecordAssignExpr instead.")]] = zeek::detail::RecordAssignExpr;
-using CastExpr [[deprecated("Remove in v4.1. Use zeek::detail::CastExpr instead.")]] = zeek::detail::CastExpr;
-using IsExpr [[deprecated("Remove in v4.1. Use zeek::detail::IsExpr instead.")]] = zeek::detail::IsExpr;

src/File.h

@@ -45,9 +45,6 @@ public:
 
 	void SetBuf(bool buffered);	// false=line buffered, true=fully buffered
 
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	Type* FType() const	{ return t.get(); }
-
 	const TypePtr& GetType() const
 		{ return t; }
 
@@ -76,9 +73,6 @@ public:
 
 	// Get the file with the given name, opening it if it doesn't yet exist.
 	static FilePtr Get(const char* name);
-	[[deprecated("Remove in v4.1.  Use File::Get().")]]
-	static File* GetFile(const char* name)
-		{ return Get(name).release(); }
 
 	void EnableRawOutput()		{ raw_output = true; }
 	bool IsRawOutput() const	{ return raw_output; }
@@ -125,7 +119,3 @@ private:
 };
 
 } // namespace zeek
-
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
-using BroFile [[deprecated("Remove in v4.1. Use zeek::File instead.")]] = zeek::File;
-using BroFilePtr [[deprecated("Remove in v4.1. Use zeek::FilePtr instead.")]] = zeek::FilePtr;

src/Frame.cc

@@ -73,9 +73,6 @@ void Frame::AddFunctionWithClosureRef(ScriptFunc* func)
 	functions_with_closure_frame_reference->emplace_back(func);
 	}
 
-void Frame::SetElement(int n, Val* v)
-	{ SetElement(n, {AdoptRef{}, v}); }
-
 void Frame::SetElement(int n, ValPtr v)
 	{
 	n += current_offset;

src/Frame.h

@@ -21,13 +21,11 @@
 ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Trigger, zeek::detail::trigger);
 
-namespace zeek::detail { class ScriptFunc; }
-using BroFunc [[deprecated("Remove in v4.1. Use zeek::detail::ScriptFunc instead.")]] = zeek::detail::ScriptFunc;
-
 namespace zeek {
 using ValPtr = IntrusivePtr<Val>;
 
 namespace detail {
+class ScriptFunc;
 using IDPtr = IntrusivePtr<ID>;
 
 namespace trigger {
@@ -67,9 +65,6 @@ public:
 		return frame[n].val;
 		}
 
-	[[deprecated("Remove in v4.1.  Use GetElement(int).")]]
-	Val* NthElement(int n) const	{ return frame[n].val.get(); }
-
 	/**
 	 * Sets the element at index *n* of the underlying array to *v*.
 	 * @param n the index to set
@@ -77,9 +72,6 @@ public:
 	 */
 	void SetElement(int n, ValPtr v);
 
-	[[deprecated("Remove in v4.1.  Pass IntrusivePtr instead.")]]
-	void SetElement(int n, Val* v);
-
 	/**
 	 * Associates *id* and *v* in the frame. Future lookups of
 	 * *id* will return *v*.
@@ -101,10 +93,6 @@ public:
 	const ValPtr& GetElementByID(const IDPtr& id) const
 		{ return GetElementByID(id.get()); }
 
-	[[deprecated("Remove in v4.1.  Use GetElementByID().")]]
-	Val* GetElement(const ID* id) const
-		{ return GetElementByID(id).get(); }
-
 	/**
 	 * Adjusts the current offset being used for frame accesses.
 	 * This is in support of inlined functions.
@@ -405,8 +393,6 @@ private:
 } // namespace detail
 } // namespace zeek
 
-using Frame [[deprecated("Remove in v4.1. Use zeek::detail::Frame instead.")]] = zeek::detail::Frame;
-
 /**
  * If we stopped using this and instead just made a struct of the information
  * that the debugger actually uses we could make the Frame a class a template.

src/Func.cc

@@ -289,12 +289,6 @@ void Func::CheckPluginResult(bool handled, const ValPtr& hook_result,
 	}
 	}
 
-Val* Func::Call(ValPList* args, detail::Frame* parent) const
-	{
-	auto zargs = val_list_to_args(*args);
-	return Invoke(&zargs, parent).release();
-	};
-
 namespace detail {
 
 ScriptFunc::ScriptFunc(const IDPtr& arg_id, StmtPtr arg_body,
@@ -1048,18 +1042,3 @@ void emit_builtin_error(const char* msg, Obj* arg)
 	}
 
 } // namespace zeek
-
-void builtin_error(const char* msg)
-	{
-	zeek::emit_builtin_error(msg);
-	}
-
-void builtin_error(const char* msg, const zeek::ValPtr& arg)
-	{
-	zeek::emit_builtin_error(msg, arg);
-	}
-
-void builtin_error(const char* msg, zeek::Obj* arg)
-	{
-	zeek::emit_builtin_error(msg, arg);
-	}

src/Func.h

@@ -57,7 +57,6 @@ public:
 	static inline const FuncPtr nil;
 
 	enum Kind { SCRIPT_FUNC, BUILTIN_FUNC };
-	static constexpr auto BRO_FUNC [[deprecated("Remove in v4.1. Use Func::SCRIPT_FUNC instead.")]] = SCRIPT_FUNC;
 
 	explicit Func(Kind arg_kind);
 
@@ -76,9 +75,6 @@ public:
 	const std::vector<Body>& GetBodies() const	{ return bodies; }
 	bool HasBodies() const	{ return bodies.size(); }
 
-	[[deprecated("Remove in v4.1. Use Invoke() instead.")]]
-	Val* Call(ValPList* args, detail::Frame* parent = nullptr) const;
-
 	/**
 	 * Calls a Zeek function.
 	 * @param args  the list of arguments to the function call.
@@ -109,9 +105,6 @@ public:
 	virtual void SetScope(detail::ScopePtr newscope);
 	virtual detail::Scope* GetScope() const		{ return scope.get(); }
 
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	virtual FuncType* FType() const { return type.get(); }
-
 	const FuncTypePtr& GetType() const
 		{ return type; }
 
@@ -385,22 +378,3 @@ extern void emit_builtin_error(const char* msg, const ValPtr&);
 extern void emit_builtin_error(const char* msg, Obj* arg);
 
 } // namespace zeek
-
-using Func [[deprecated("Remove in v4.1. Use zeek::Func.")]] = zeek::Func;
-using BroFunc [[deprecated("Remove in v4.1. Use zeek::detail::ScriptFunc.")]] = zeek::detail::ScriptFunc;
-using BuiltinFunc [[deprecated("Remove in v4.1. Use zeek::detail::BuiltinFunc.")]] = zeek::detail::BuiltinFunc;
-using CallInfo [[deprecated("Remove in v4.1. Use zeek::detail::CallInfo.")]] = zeek::detail::CallInfo;
-using function_ingredients [[deprecated("Remove in v4.1. Use zeek::detail::function_ingredients.")]] = zeek::detail::function_ingredients;
-
-constexpr auto check_built_in_call [[deprecated("Remove in v4.1. Use zeek::detail::check_built_in_call.")]] = zeek::detail::check_built_in_call;
-constexpr auto render_call_stack [[deprecated("Remove in v4.1. Use zeek::render_call_stack.")]] = zeek::render_call_stack;
-
-// TODO: do call_stack and did_builtin_init need to be aliased?
-
-// These have to be implemented as actual methods due to function overloading breaking the use of aliases.
-[[deprecated("Remove in v4.1. Use zeek::emit_builtin_error.")]]
-extern void builtin_error(const char* msg);
-[[deprecated("Remove in v4.1. Use zeek::emit_builtin_error.")]]
-extern void builtin_error(const char* msg, zeek::ValPtr);
-[[deprecated("Remove in v4.1. Use zeek::emit_builtin_error.")]]
-extern void builtin_error(const char* msg, zeek::Obj* arg);

src/Hash.h

@@ -30,7 +30,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(BifReturnVal, zeek::detail);
 
 namespace zeek { class String; }
-using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;
 
 namespace zeek::BifFunc {
 	extern zeek::detail::BifReturnVal md5_hmac_bif(zeek::detail::Frame* frame, const zeek::Args*);
@@ -281,18 +280,3 @@ protected:
 extern void init_hash_function();
 
 } // namespace zeek::detail
-
-using hash_t [[deprecated("Remove in v4.1. Use zeek::detail::hash_t.")]] = zeek::detail::hash_t;
-using hash64_t [[deprecated("Remove in v4.1. Use zeek::detail::hash64_t.")]] = zeek::detail::hash64_t;
-using hash128_t [[deprecated("Remove in v4.1. Use zeek::detail::hash128_t.")]] = zeek::detail::hash128_t;
-using hash256_t [[deprecated("Remove in v4.1. Use zeek::detail::hash256_t.")]] = zeek::detail::hash256_t;
-
-using KeyedHash [[deprecated("Remove in v4.1. Use zeek::detail::KeyedHash.")]] = zeek::detail::KeyedHash;
-using HashKeyTag [[deprecated("Remove in v4.1. Use zeek::detail::HashKeyTag.")]] = zeek::detail::HashKeyTag;
-using HashKey [[deprecated("Remove in v4.1. Use zeek::detail::HashKey.")]] = zeek::detail::HashKey;
-
-constexpr auto HASH_KEY_INT [[deprecated("Remove in v4.1. Use zeek::detail::HASH_KEY_INT.")]] = zeek::detail::HASH_KEY_INT;
-constexpr auto HASH_KEY_DOUBLE [[deprecated("Remove in v4.1. Use zeek::detail::HASH_KEY_DOUBLE.")]] = zeek::detail::HASH_KEY_DOUBLE;
-constexpr auto HASH_KEY_STRING [[deprecated("Remove in v4.1. Use zeek::detail::HASH_KEY_STRING.")]] = zeek::detail::HASH_KEY_STRING;
-
-constexpr auto init_hash_function [[deprecated("Remove in v4.1. Use zeek::detail::init_hash_function.")]] = zeek::detail::init_hash_function;

src/ID.cc

@@ -138,11 +138,6 @@ void ID::SetType(TypePtr t)
 	type = std::move(t);
 	}
 
-void ID::SetType(zeek::Type* t)
-	{
-	SetType({AdoptRef(), t});
-	}
-
 void ID::ClearVal()
 	{
 	val = nullptr;

src/ID.h

@@ -31,8 +31,6 @@ using ValPtr = IntrusivePtr<Val>;
 using FuncPtr = IntrusivePtr<Func>;
 }
 
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
-
 namespace zeek::detail {
 
 class Attributes;
@@ -64,13 +62,6 @@ public:
 	std::string ModuleName() const;
 
 	void SetType(TypePtr t);
-	[[deprecated("Remove in v4.1.  Use version that takes IntrusivePtr.")]]
-	void SetType(zeek::Type* t);
-
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	zeek::Type* Type()			{ return type.get(); }
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	const zeek::Type* Type() const	{ return type.get(); }
 
 	const TypePtr& GetType() const
 		{ return type; }
@@ -79,11 +70,6 @@ public:
 	IntrusivePtr<T> GetType() const
 		{ return cast_intrusive<T>(type); }
 
-	[[deprecated("Remove in v4.1.  Use IsType() and GetType().")]]
-	zeek::Type* AsType()		{ return is_type ? GetType().get() : nullptr; }
-	[[deprecated("Remove in v4.1.  Use IsType() and GetType().")]]
-	const zeek::Type* AsType() const	{ return is_type ? GetType().get() : nullptr; }
-
 	bool IsType() const
 		{ return is_type; }
 
@@ -96,11 +82,6 @@ public:
 
 	bool HasVal() const		{ return val != nullptr; }
 
-	[[deprecated("Remove in v4.1.  Use GetVal().")]]
-	Val* ID_Val()			{ return val.get(); }
-	[[deprecated("Remove in v4.1.  Use GetVal().")]]
-	const Val* ID_Val() const	{ return val.get(); }
-
 	const ValPtr& GetVal() const
 		{ return val; }
 
@@ -128,9 +109,6 @@ public:
 	const AttributesPtr& GetAttrs() const
 		{ return attrs; }
 
-	[[deprecated("Remove in 4.1.  Use GetAttrs().")]]
-	Attributes* Attrs() const	{ return attrs.get(); }
-
 	const AttrPtr& GetAttr(AttrTag t) const;
 
 	bool IsDeprecated() const;
@@ -184,8 +162,6 @@ protected:
 
 } // namespace zeek::detail
 
-using ID [[deprecated("Remove in v4.1. Use zeek::detail::ID instead.")]] = zeek::detail::ID;
-
 namespace zeek::id {
 
 /**
@@ -276,23 +252,3 @@ void init_types();
 
 } // namespace detail
 } // namespace zeek::id
-
-using ID [[deprecated("Remove in v4.1 Use zeek::detail::ID instead.")]] = zeek::detail::ID;
-
-using init_class [[deprecated("Remove in v4.1. Use zeek::detail::InitClass instead.")]] = zeek::detail::InitClass;
-[[deprecated("Remove in v4.1. Use zeek::detail::INIT_NONE instead.")]]
-constexpr auto INIT_NONE = zeek::detail::INIT_NONE;
-[[deprecated("Remove in v4.1. Use zeek::detail::INIT_FULL instead.")]]
-constexpr auto INIT_FULL = zeek::detail::INIT_FULL;
-[[deprecated("Remove in v4.1. Use zeek::detail::INIT_EXTRA instead.")]]
-constexpr auto INIT_EXTRA = zeek::detail::INIT_EXTRA;
-[[deprecated("Remove in v4.1. Use zeek::detail::INIT_REMOVE instead.")]]
-constexpr auto INIT_REMOVE = zeek::detail::INIT_REMOVE;
-
-using IDScope [[deprecated("Remove in v4.1. Use zeek::detail::IDScope instead.")]] = zeek::detail::IDScope;
-[[deprecated("Remove in v4.1. Use zeek::detail::SCOPE_FUNCTION instead.")]]
-constexpr auto SCOPE_FUNCTION = zeek::detail::SCOPE_FUNCTION;
-[[deprecated("Remove in v4.1. Use zeek::detail::SCOPE_MODULE instead.")]]
-constexpr auto SCOPE_MODULE = zeek::detail::SCOPE_MODULE;
-[[deprecated("Remove in v4.1. Use zeek::detail::SCOPE_GLOBAL instead.")]]
-constexpr auto SCOPE_GLOBAL = zeek::detail::SCOPE_GLOBAL;

src/IP.cc

@@ -303,11 +303,6 @@ RecordValPtr IPv6_Hdr::ToVal(VectorValPtr chain) const
 RecordValPtr IPv6_Hdr::ToVal() const
 	{ return ToVal(nullptr); }
 
-RecordVal* IPv6_Hdr::BuildRecordVal(VectorVal* chain) const
-	{
-	return ToVal({AdoptRef{}, chain}).release();
-	}
-
 IPAddr IP_Hdr::IPHeaderSrcAddr() const
 	{
 	return ip4 ? IPAddr(ip4->ip_src) : IPAddr(ip6->ip6_src);
@@ -353,22 +348,12 @@ RecordValPtr IP_Hdr::ToIPHdrVal() const
 	return rval;
 	}
 
-RecordVal* IP_Hdr::BuildIPHdrVal() const
-	{
-	return ToIPHdrVal().release();
-	}
-
 RecordValPtr IP_Hdr::ToPktHdrVal() const
 	{
 	static auto pkt_hdr_type = id::find_type<RecordType>("pkt_hdr");
 	return ToPktHdrVal(make_intrusive<RecordVal>(pkt_hdr_type), 0);
 	}
 
-RecordVal* IP_Hdr::BuildPktHdrVal() const
-	{
-	return ToPktHdrVal().release();
-	}
-
 RecordValPtr IP_Hdr::ToPktHdrVal(RecordValPtr pkt_hdr, int sindex) const
 	{
 	static auto tcp_hdr_type = id::find_type<RecordType>("tcp_hdr");
@@ -452,11 +437,6 @@ RecordValPtr IP_Hdr::ToPktHdrVal(RecordValPtr pkt_hdr, int sindex) const
 	return pkt_hdr;
 	}
 
-RecordVal* IP_Hdr::BuildPktHdrVal(RecordVal* pkt_hdr, int sindex) const
-	{
-	return ToPktHdrVal({AdoptRef{}, pkt_hdr}, sindex).release();
-	}
-
 static inline bool isIPv6ExtHeader(uint8_t type)
 	{
 	switch (type) {
@@ -732,11 +712,6 @@ VectorValPtr IPv6_Hdr_Chain::ToVal() const
 	return rval;
 	}
 
-VectorVal* IPv6_Hdr_Chain::BuildVal() const
-	{
-	return ToVal().release();
-	}
-
 IP_Hdr* IP_Hdr::Copy() const
 	{
 	char* new_hdr = new char[HdrLen()];

src/IP.h

@@ -144,9 +144,6 @@ public:
 	RecordValPtr ToVal(VectorValPtr chain) const;
 	RecordValPtr ToVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToVal() instead.")]]
-	RecordVal* BuildRecordVal(VectorVal* chain = nullptr) const;
-
 protected:
 	uint8_t type;
 	const u_char* data;
@@ -236,9 +233,6 @@ public:
 	 */
 	VectorValPtr ToVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToVal() instead.")]]
-	VectorVal* BuildVal() const;
-
 protected:
 	// for access to protected ctor that changes next header values that
 	// point to a fragment
@@ -533,27 +527,18 @@ public:
 	 */
 	RecordValPtr ToIPHdrVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToIPHdrVal() instead.")]]
-	RecordVal* BuildIPHdrVal() const;
-
 	/**
 	 * Returns a pkt_hdr RecordVal, which includes not only the IP header, but
 	 * also upper-layer (tcp/udp/icmp) headers.
 	 */
 	RecordValPtr ToPktHdrVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToPktHdrVal() instead.")]]
-	RecordVal* BuildPktHdrVal() const;
-
 	/**
 	 * Same as above, but simply add our values into the record at the
 	 * specified starting index.
 	 */
 	RecordValPtr ToPktHdrVal(RecordValPtr pkt_hdr, int sindex) const;
 
-	[[deprecated("Remove in v4.1.  Use ToPktHdrVal() instead.")]]
-	RecordVal* BuildPktHdrVal(RecordVal* pkt_hdr, int sindex) const;
-
 	/**
 	 * Denotes whether this header is from a set of packet fragments.
 	 */
@@ -567,11 +552,3 @@ private:
 };
 
 } // namespace zeek
-
-#ifdef ENABLE_MOBILE_IPV6
-using ip6_mobility [[deprecated("Remove in v4.1. Use zeek::ip6_mobility.")]] = zeek::ip6_mobility;
-#endif
-
-using IPv6_Hdr [[deprecated("Remove in v4.1. Use zeek::IPv6_Hdr.")]] = zeek::IPv6_Hdr;
-using IPv6_Hdr_Chain [[deprecated("Remove in v4.1. Use zeek::IPv6_Hdr_Chain.")]] = zeek::IPv6_Hdr_Chain;
-using IP_Hdr [[deprecated("Remove in v4.1. Use zeek::IP_Hdr.")]] = zeek::IP_Hdr;

src/IPAddr.cc

@@ -50,9 +50,6 @@ IPAddr::IPAddr(const String& s)
 	Init(s.CheckString());
 	}
 
-detail::HashKey* IPAddr::GetHashKey() const
-	{ return MakeHashKey().release(); }
-
 std::unique_ptr<detail::HashKey> IPAddr::MakeHashKey() const
 	{
 	return std::make_unique<detail::HashKey>((void*)in6.s6_addr, sizeof(in6.s6_addr));
@@ -303,9 +300,6 @@ std::string IPPrefix::AsString() const
 	return prefix.AsString() +"/" + l;
 	}
 
-detail::HashKey* IPPrefix::GetHashKey() const
-	{ return MakeHashKey().release(); }
-
 std::unique_ptr<detail::HashKey> IPPrefix::MakeHashKey() const
 	{
 	struct {

src/IPAddr.h

@@ -10,18 +10,16 @@
 
 #include "zeek/threading/SerialTypes.h"
 
-namespace zeek { class String; }
-using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;
-
-namespace zeek { struct ConnID; }
-using ConnID [[deprecated("Remove in v4.1. Use zeek::ConnID.")]] = zeek::ConnID;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(HashKey, zeek::detail);
 namespace analyzer { class ExpectedConn; }
 
 typedef in_addr in4_addr;
 
 namespace zeek {
+
+class String;
+struct ConnID;
+
 namespace detail {
 
 struct ConnIDKey {
@@ -264,9 +262,6 @@ public:
 	 */
 	std::unique_ptr<detail::HashKey> MakeHashKey() const;
 
-	[[deprecated("Remove in v4.1.  Use MakeHashKey().")]]
-	detail::HashKey* GetHashKey() const;
-
 	/**
 	 * Masks out lower bits of the address.
 	 *
@@ -646,9 +641,6 @@ public:
 	 */
 	std::unique_ptr<detail::HashKey> MakeHashKey() const;
 
-	[[deprecated("Remove in v4.1.  Use MakeHashKey().")]]
-	detail::HashKey* GetHashKey() const;
-
 	/** Converts the prefix into the type used internally by the
 	  * inter-thread communication.
 	  */
@@ -733,9 +725,3 @@ private:
 };
 
 } // namespace zeek
-
-using ConnIDKey [[deprecated("Remove in v4.1. Use zeek::detail::ConnIDKey.")]] = zeek::detail::ConnIDKey;
-using IPAddr [[deprecated("Remove in v4.1. Use zeek::IPAddr.")]] = zeek::IPAddr;
-using IPPrefix [[deprecated("Remove in v4.1. Use zeek::IPPrefix.")]] = zeek::IPPrefix;
-
-constexpr auto BuildConnIDKey [[deprecated("Remove in v4.1. Use zeek::detail::BuildConnIDKey.")]] = zeek::detail::BuildConnIDKey;

src/IntSet.h

@@ -68,5 +68,3 @@ inline void IntSet::Clear()
 	}
 
 } // namespace zeek::detail
-
-using IntSet [[deprecated("Remove in v4.1. Use zeek::detail::IntSet.")]] = zeek::detail::IntSet;

src/List.h

@@ -337,8 +337,6 @@ using name_list = PList<char>;
 
 } // namespace zeek
 
-using ListOrder [[deprecated("Remove in v4.1. Use zeek::ListOrder instead.")]] = zeek::ListOrder;
-
 // Macro to visit each list element in turn.
 #define loop_over_list(list, iterator)  \
 	int iterator;	\

src/NFA.h

@@ -137,13 +137,3 @@ extern NFA_state_list* epsilon_closure(NFA_state_list* states);
 extern bool NFA_state_cmp_neg(const NFA_State* v1, const NFA_State* v2);
 
 } // namespace zeek::detail
-
-using NFA_state_list [[deprecated("Remove in v4.1. Use zeek::detail::NFA_state_list.")]] = zeek::detail::NFA_state_list;
-using NFA_State [[deprecated("Remove in v4.1. Use zeek::detail::NFA_State.")]] = zeek::detail::NFA_State;
-using EpsilonState [[deprecated("Remove in v4.1. Use zeek::detail::EpsilonState.")]] = zeek::detail::EpsilonState;
-using NFA_Machine [[deprecated("Remove in v4.1. Use zeek::detail::NFA_Machine.")]] = zeek::detail::NFA_Machine;
-
-// TODO: could at least the first two of these methods be made static methods in NFA_Machine and NFA_State to remove them from the namespace?
-constexpr auto make_alternate [[deprecated("Remove in v4.1. Use zeek::detail::make_alternate.")]] = zeek::detail::make_alternate;
-constexpr auto epsilon_closure [[deprecated("Remove in v4.1. Use zeek::detail::epsilon_closure.")]] = zeek::detail::epsilon_closure;
-constexpr auto NFA_state_cmp_neg [[deprecated("Remove in v4.1. Use zeek::detail::NFA_state_cmp_neg.")]] = zeek::detail::NFA_state_cmp_neg;

src/NetVar.cc

@@ -245,8 +245,6 @@ void init_general_global_var()
 	bits_per_uid = id::find_val("bits_per_uid")->AsCount();
 	}
 
-extern void zeek_legacy_netvar_init();
-
 void init_builtin_types()
 	{
 	init_bif_types();
@@ -257,8 +255,6 @@ void init_net_var()
 	{
 	bif_init_net_var();
 
-	zeek_legacy_netvar_init();
-
 	ignore_checksums = id::find_val("ignore_checksums")->AsBool();
 	partial_connection_ok = id::find_val("partial_connection_ok")->AsBool();
 	tcp_SYN_ack_ok = id::find_val("tcp_SYN_ack_ok")->AsBool();
@@ -358,69 +354,3 @@ void init_net_var()
 	}
 
 } // namespace zeek::detail
-
-// Remove in v4.1.
-int& watchdog_interval = zeek::detail::watchdog_interval;
-int& max_timer_expires = zeek::detail::max_timer_expires;
-int& ignore_checksums = zeek::detail::ignore_checksums;
-int& partial_connection_ok = zeek::detail::partial_connection_ok;
-int& tcp_SYN_ack_ok = zeek::detail::tcp_SYN_ack_ok;
-int& tcp_match_undelivered = zeek::detail::tcp_match_undelivered;
-double& frag_timeout = zeek::detail::frag_timeout;
-double& tcp_SYN_timeout = zeek::detail::tcp_SYN_timeout;
-double& tcp_session_timer = zeek::detail::tcp_session_timer;
-double& tcp_connection_linger = zeek::detail::tcp_connection_linger;
-double& tcp_attempt_delay = zeek::detail::tcp_attempt_delay;
-double& tcp_close_delay = zeek::detail::tcp_close_delay;
-double& tcp_partial_close_delay = zeek::detail::tcp_partial_close_delay;
-double& tcp_reset_delay = zeek::detail::tcp_reset_delay;
-int& tcp_max_initial_window = zeek::detail::tcp_max_initial_window;
-int& tcp_max_above_hole_without_any_acks = zeek::detail::tcp_max_above_hole_without_any_acks;
-int& tcp_excessive_data_without_further_acks = zeek::detail::tcp_excessive_data_without_further_acks;
-int& tcp_max_old_segments = zeek::detail::tcp_max_old_segments;
-double& non_analyzed_lifetime = zeek::detail::non_analyzed_lifetime;
-double& tcp_inactivity_timeout = zeek::detail::tcp_inactivity_timeout;
-double& udp_inactivity_timeout = zeek::detail::udp_inactivity_timeout;
-double& icmp_inactivity_timeout = zeek::detail::icmp_inactivity_timeout;
-int& tcp_storm_thresh = zeek::detail::tcp_storm_thresh;
-double& tcp_storm_interarrival_thresh = zeek::detail::tcp_storm_interarrival_thresh;
-bool& tcp_content_deliver_all_orig = zeek::detail::tcp_content_deliver_all_orig;
-bool& tcp_content_deliver_all_resp = zeek::detail::tcp_content_deliver_all_resp;
-bool& udp_content_deliver_all_orig = zeek::detail::udp_content_deliver_all_orig;
-bool& udp_content_deliver_all_resp = zeek::detail::udp_content_deliver_all_resp;
-bool& udp_content_delivery_ports_use_resp = zeek::detail::udp_content_delivery_ports_use_resp;
-double& dns_session_timeout = zeek::detail::dns_session_timeout;
-double& rpc_timeout = zeek::detail::rpc_timeout;
-int& mime_segment_length = zeek::detail::mime_segment_length;
-int& mime_segment_overlap_length = zeek::detail::mime_segment_overlap_length;
-int& http_entity_data_delivery_size = zeek::detail::http_entity_data_delivery_size;
-int& truncate_http_URI = zeek::detail::truncate_http_URI;
-int& dns_skip_all_auth = zeek::detail::dns_skip_all_auth;
-int& dns_skip_all_addl = zeek::detail::dns_skip_all_addl;
-int& dns_max_queries = zeek::detail::dns_max_queries;
-double& stp_delta = zeek::detail::stp_delta;
-double& stp_idle_min = zeek::detail::stp_idle_min;
-double& table_expire_interval = zeek::detail::table_expire_interval;
-double& table_expire_delay = zeek::detail::table_expire_delay;
-int& table_incremental_step = zeek::detail::table_incremental_step;
-int& orig_addr_anonymization = zeek::detail::orig_addr_anonymization;
-int& resp_addr_anonymization = zeek::detail::resp_addr_anonymization;
-int& other_addr_anonymization = zeek::detail::other_addr_anonymization;
-double& connection_status_update_interval = zeek::detail::connection_status_update_interval;
-double& profiling_interval = zeek::detail::profiling_interval;
-int& expensive_profiling_multiple = zeek::detail::expensive_profiling_multiple;
-int& segment_profiling = zeek::detail::segment_profiling;
-int& pkt_profile_mode = zeek::detail::pkt_profile_mode;
-double& pkt_profile_freq = zeek::detail::pkt_profile_freq;
-int& load_sample_freq = zeek::detail::load_sample_freq;
-int& packet_filter_default = zeek::detail::packet_filter_default;
-int& sig_max_group_size = zeek::detail::sig_max_group_size;
-int& dpd_reassemble_first_packets = zeek::detail::dpd_reassemble_first_packets;
-int& dpd_buffer_size = zeek::detail::dpd_buffer_size;
-int& dpd_match_only_beginning = zeek::detail::dpd_match_only_beginning;
-int& dpd_late_match_stop = zeek::detail::dpd_late_match_stop;
-int& dpd_ignore_ports = zeek::detail::dpd_ignore_ports;
-int& check_for_unused_event_handlers = zeek::detail::check_for_unused_event_handlers;
-double& timer_mgr_inactivity_timeout = zeek::detail::timer_mgr_inactivity_timeout;
-int& record_all_packets = zeek::detail::record_all_packets;
-bro_uint_t& bits_per_uid = zeek::detail::bits_per_uid;

src/NetVar.h

@@ -105,241 +105,6 @@ extern void init_builtin_types();
 
 } // namespace zeek::detail
 
-constexpr auto init_general_global_var [[deprecated("Remove in v4.1. Use zeek::detail::init_general_global_var.")]] = zeek::detail::init_general_global_var;
-constexpr auto init_event_handlers [[deprecated("Remove in v4.1. Use zeek::detail::init_event_handlers.")]] = zeek::detail::init_event_handlers;
-constexpr auto init_net_var [[deprecated("Remove in v4.1. Use zeek::detail::init_net_var.")]] = zeek::detail::init_net_var;
-
-extern int& watchdog_interval [[deprecated("Remove in v4.1. Use zeek::detail::watchdog_interval.")]];
-extern int& max_timer_expires [[deprecated("Remove in v4.1. Use zeek::detail::max_timer_expires.")]];
-extern int& ignore_checksums [[deprecated("Remove in v4.1. Use zeek::detail::ignore_checksums.")]];
-extern int& partial_connection_ok [[deprecated("Remove in v4.1. Use zeek::detail::partial_connection_ok.")]];
-extern int& tcp_SYN_ack_ok [[deprecated("Remove in v4.1. Use zeek::detail::tcp_SYN_ack_ok.")]];
-extern int& tcp_match_undelivered [[deprecated("Remove in v4.1. Use zeek::detail::tcp_match_undelivered.")]];
-extern double& frag_timeout [[deprecated("Remove in v4.1. Use zeek::detail::frag_timeout.")]];
-extern double& tcp_SYN_timeout [[deprecated("Remove in v4.1. Use zeek::detail::tcp_SYN_timeout.")]];
-extern double& tcp_session_timer [[deprecated("Remove in v4.1. Use zeek::detail::tcp_session_timer.")]];
-extern double& tcp_connection_linger [[deprecated("Remove in v4.1. Use zeek::detail::tcp_connection_linger.")]];
-extern double& tcp_attempt_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_attempt_delay.")]];
-extern double& tcp_close_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_close_delay.")]];
-extern double& tcp_partial_close_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_partial_close_delay.")]];
-extern double& tcp_reset_delay [[deprecated("Remove in v4.1. Use zeek::detail::tcp_reset_delay.")]];
-extern int& tcp_max_initial_window [[deprecated("Remove in v4.1. Use zeek::detail::tcp_max_initial_window.")]];
-extern int& tcp_max_above_hole_without_any_acks [[deprecated("Remove in v4.1. Use zeek::detail::tcp_max_above_hole_without_any_acks.")]];
-extern int& tcp_excessive_data_without_further_acks [[deprecated("Remove in v4.1. Use zeek::detail::tcp_excessive_data_without_further_acks.")]];
-extern int& tcp_max_old_segments [[deprecated("Remove in v4.1. Use zeek::detail::tcp_max_old_segments.")]];
-extern double& non_analyzed_lifetime [[deprecated("Remove in v4.1. Use zeek::detail::non_analyzed_lifetime.")]];
-extern double& tcp_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::tcp_inactivity_timeout.")]];
-extern double& udp_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::udp_inactivity_timeout.")]];
-extern double& icmp_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::icmp_inactivity_timeout.")]];
-extern int& tcp_storm_thresh [[deprecated("Remove in v4.1. Use zeek::detail::tcp_storm_thresh.")]];
-extern double& tcp_storm_interarrival_thresh [[deprecated("Remove in v4.1. Use zeek::detail::tcp_storm_interarrival_thresh.")]];
-extern bool& tcp_content_deliver_all_orig [[deprecated("Remove in v4.1. Use zeek::detail::tcp_content_deliver_all_orig.")]];
-extern bool& tcp_content_deliver_all_resp [[deprecated("Remove in v4.1. Use zeek::detail::tcp_content_deliver_all_resp.")]];
-extern bool& udp_content_deliver_all_orig [[deprecated("Remove in v4.1. Use zeek::detail::udp_content_deliver_all_orig.")]];
-extern bool& udp_content_deliver_all_resp [[deprecated("Remove in v4.1. Use zeek::detail::udp_content_deliver_all_resp.")]];
-extern bool& udp_content_delivery_ports_use_resp [[deprecated("Remove in v4.1. Use zeek::detail::udp_content_delivery_ports_use_resp.")]];
-extern double& dns_session_timeout [[deprecated("Remove in v4.1. Use zeek::detail::dns_session_timeout.")]];
-extern double& rpc_timeout [[deprecated("Remove in v4.1. Use zeek::detail::rpc_timeout.")]];
-extern int& mime_segment_length [[deprecated("Remove in v4.1. Use zeek::detail::mime_segment_length.")]];
-extern int& mime_segment_overlap_length [[deprecated("Remove in v4.1. Use zeek::detail::mime_segment_overlap_length.")]];
-extern int& http_entity_data_delivery_size [[deprecated("Remove in v4.1. Use zeek::detail::http_entity_data_delivery_size.")]];
-extern int& truncate_http_URI [[deprecated("Remove in v4.1. Use zeek::detail::truncate_http_URI.")]];
-extern int& dns_skip_all_auth [[deprecated("Remove in v4.1. Use zeek::detail::dns_skip_all_auth.")]];
-extern int& dns_skip_all_addl [[deprecated("Remove in v4.1. Use zeek::detail::dns_skip_all_addl.")]];
-extern int& dns_max_queries [[deprecated("Remove in v4.1. Use zeek::detail::dns_max_queries.")]];
-extern double& stp_delta [[deprecated("Remove in v4.1. Use zeek::detail::stp_delta.")]];
-extern double& stp_idle_min [[deprecated("Remove in v4.1. Use zeek::detail::stp_idle_min.")]];
-extern double& table_expire_interval [[deprecated("Remove in v4.1. Use zeek::detail::table_expire_interval.")]];
-extern double& table_expire_delay [[deprecated("Remove in v4.1. Use zeek::detail::table_expire_delay.")]];
-extern int& table_incremental_step [[deprecated("Remove in v4.1. Use zeek::detail::table_incremental_step.")]];
-extern int& orig_addr_anonymization [[deprecated("Remove in v4.1. Use zeek::detail::orig_addr_anonymization.")]];
-extern int& resp_addr_anonymization [[deprecated("Remove in v4.1. Use zeek::detail::resp_addr_anonymization.")]];
-extern int& other_addr_anonymization [[deprecated("Remove in v4.1. Use zeek::detail::other_addr_anonymization.")]];
-extern double& connection_status_update_interval [[deprecated("Remove in v4.1. Use zeek::detail::connection_status_update_interval.")]];
-extern double& profiling_interval [[deprecated("Remove in v4.1. Use zeek::detail::profiling_interval.")]];
-extern int& expensive_profiling_multiple [[deprecated("Remove in v4.1. Use zeek::detail::expensive_profiling_multiple.")]];
-extern int& segment_profiling [[deprecated("Remove in v4.1. Use zeek::detail::segment_profiling.")]];
-extern int& pkt_profile_mode [[deprecated("Remove in v4.1. Use zeek::detail::pkt_profile_mode.")]];
-extern double& pkt_profile_freq [[deprecated("Remove in v4.1. Use zeek::detail::pkt_profile_freq.")]];
-extern int& load_sample_freq [[deprecated("Remove in v4.1. Use zeek::detail::load_sample_freq.")]];
-extern int& packet_filter_default [[deprecated("Remove in v4.1. Use zeek::detail::packet_filter_default.")]];
-extern int& sig_max_group_size [[deprecated("Remove in v4.1. Use zeek::detail::sig_max_group_size.")]];
-extern int& dpd_reassemble_first_packets [[deprecated("Remove in v4.1. Use zeek::detail::dpd_reassemble_first_packets.")]];
-extern int& dpd_buffer_size [[deprecated("Remove in v4.1. Use zeek::detail::dpd_buffer_size.")]];
-extern int& dpd_match_only_beginning [[deprecated("Remove in v4.1. Use zeek::detail::dpd_match_only_beginning.")]];
-extern int& dpd_late_match_stop [[deprecated("Remove in v4.1. Use zeek::detail::dpd_late_match_stop.")]];
-extern int& dpd_ignore_ports [[deprecated("Remove in v4.1. Use zeek::detail::dpd_ignore_ports.")]];
-extern int& check_for_unused_event_handlers [[deprecated("Remove in v4.1. Use zeek::detail::check_for_unused_event_handlers.")]];
-extern double& timer_mgr_inactivity_timeout [[deprecated("Remove in v4.1. Use zeek::detail::timer_mgr_inactivity_timeout.")]];
-extern int& record_all_packets [[deprecated("Remove in v4.1. Use zeek::detail::record_all_packets.")]];
-extern bro_uint_t& bits_per_uid [[deprecated("Remove in v4.1. Use zeek::detail::bits_per_uid.")]];
-
-[[deprecated("Remove in v4.1.  Use zeek::id::conn_id.")]]
-extern zeek::RecordType* conn_id;
-[[deprecated("Remove in v4.1.  Use zeek::id::endpoint.")]]
-extern zeek::RecordType* endpoint;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* endpoint_stats;
-[[deprecated("Remove in v4.1.  Use zeek::id::connection.")]]
-extern zeek::RecordType* connection_type;
-[[deprecated("Remove in v4.1.  Use zeek::id::fa_file.")]]
-extern zeek::RecordType* fa_file_type;
-[[deprecated("Remove in v4.1.  Use zeek::id::fa_metadata.")]]
-extern zeek::RecordType* fa_metadata_type;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* icmp_conn;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* icmp_context;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* signature_state;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* SYN_packet;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* pcap_packet;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* raw_pkt_hdr_type;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* l2_hdr_type;
-[[deprecated("Remove in v4.1.  Use zeek::id::transport_proto.")]]
-extern zeek::EnumType* transport_proto;
-[[deprecated("Remove in v4.1.  Use zeek::id::string_set.")]]
-extern zeek::TableType* string_set;
-[[deprecated("Remove in v4.1.  Use zeek::id::string_array.")]]
-extern zeek::TableType* string_array;
-[[deprecated("Remove in v4.1.  Use zeek::id::count_set.")]]
-extern zeek::TableType* count_set;
-[[deprecated("Remove in v4.1.  Use zeek::id::string_vec.")]]
-extern zeek::VectorType* string_vec;
-[[deprecated("Remove in v4.1.  Use zeek::id::index_vec.")]]
-extern zeek::VectorType* index_vec;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::VectorType* mime_matches;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* mime_match;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* socks_address;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* tcp_reassembler_ports_orig;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* tcp_reassembler_ports_resp;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* tcp_content_delivery_ports_orig;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* tcp_content_delivery_ports_resp;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* udp_content_delivery_ports_orig;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* udp_content_delivery_ports_resp;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* udp_content_ports;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* mime_header_rec;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableType* mime_header_list;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* http_stats_rec;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* http_message_stat;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* pm_mapping;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableType* pm_mappings;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* pm_port_request;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* pm_callit_request;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* geo_location;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* entropy_test_result;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_msg;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_answer;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_soa;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_edns_additional;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_edns_ecs;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_tsig_additional;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_rrsig_rr;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_dnskey_rr;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_nsec3_rr;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* dns_ds_rr;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* dns_skip_auth;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* dns_skip_addl;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* stp_skip_src;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* preserve_orig_addr;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* preserve_resp_addr;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* preserve_other_addr;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* rotate_info;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::StringVal* log_rotate_base_time;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::StringVal* peer_description;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::Val* profiling_file;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::Val* pkt_profile_file;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableType* irc_join_list;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* irc_join_info;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableVal* likely_server_ports;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::StringVal* trace_output_file;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* script_id;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableType* id_table;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* record_field;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::TableType* record_field_table;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::RecordType* call_argument;
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::VectorType* call_argument_vector;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::StringVal* cmd_line_bpf_filter;
-
-[[deprecated("Remove in v4.1.  Perform your own lookup.")]]
-extern zeek::StringVal* global_hash_seed;
-
 #include "const.bif.netvar_h"
 #include "types.bif.netvar_h"
 #include "event.bif.netvar_h"

src/Notifier.cc

@@ -6,7 +6,6 @@
 #include "zeek/DebugLogger.h"
 
 zeek::notifier::detail::Registry zeek::notifier::detail::registry;
-zeek::notifier::detail::Registry& notifier::registry = zeek::notifier::detail::registry;
 
 namespace zeek::notifier::detail {
 

src/Notifier.h

@@ -119,13 +119,3 @@ protected:
 };
 
 } // namespace zeek::notifier::detail
-
-namespace notifier {
-
-using Receiver [[deprecated("Remove in v4.1. Use zeek::notifier::detail::Receiver.")]] = zeek::notifier::detail::Receiver;
-using Registry [[deprecated("Remove in v4.1. Use zeek::notifier::detail::Registry.")]] = zeek::notifier::detail::Registry;
-using Modifiable [[deprecated("Remove in v4.1. Use zeek::notifier::detail::Modifiable.")]] = zeek::notifier::detail::Modifiable;
-
-extern zeek::notifier::detail::Registry& registry [[deprecated("Remove from v4.1. Use zeek::notifier::detail::registry.")]];
-
-} // namespace notifier

src/Obj.cc

@@ -213,8 +213,3 @@ void obj_delete_func(void* v)
 	}
 
 } // namespace zeek
-
-void print(const zeek::Obj* obj)
-	{
-	obj->Print();
-	}

src/Obj.h

@@ -194,22 +194,3 @@ inline void Unref(Obj* o)
 extern void obj_delete_func(void* v);
 
 } // namespace zeek
-
-using Location [[deprecated("Remove in v4.1. Use zeek::detail::Location instead.")]] = zeek::detail::Location;
-using yyltype [[deprecated("Remove in v4.1. Use zeek::detail::yyltype instead.")]] = zeek::detail::yyltype;
-using BroObj [[deprecated("Remove in v4.1. Use zeek::Obj instead.")]] = zeek::Obj;
-
-[[deprecated("Remove in v4.1. Use zeek::Obj::Print instead.")]]
-extern void print(const zeek::Obj* obj);
-
-[[deprecated("Remove in v4.1. Use zeek::detail::set_location instead.")]]
-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 zeek::detail::Location start, const zeek::detail::Location end)
-	{
-	zeek::detail::set_location(start, end);
-	}

src/OpaqueVal.cc

@@ -40,9 +40,6 @@ OpaqueMgr* OpaqueMgr::mgr()
 	return &mgr;
 	}
 
-OpaqueVal::OpaqueVal(OpaqueType* t) : OpaqueVal({NewRef{}, t})
-	{}
-
 OpaqueVal::OpaqueVal(OpaqueTypePtr t) : Val(std::move(t))
 	{}
 
@@ -214,9 +211,6 @@ HashVal::HashVal(OpaqueTypePtr t) : OpaqueVal(std::move(t))
 	valid = false;
 	}
 
-HashVal::HashVal(OpaqueType* t) : HashVal({NewRef{}, t})
-	{}
-
 MD5Val::MD5Val() : HashVal(md5_type)
 	{
 	}

src/OpaqueVal.h

@@ -96,8 +96,6 @@ private:
  */
 class OpaqueVal : public Val {
 public:
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtr instead.")]]
-	explicit OpaqueVal(OpaqueType* t);
 	explicit OpaqueVal(OpaqueTypePtr t);
 	~OpaqueVal() override;
 
@@ -187,8 +185,6 @@ protected:
 	static void digest_one(EVP_MD_CTX* h, const Val* v);
 	static void digest_one(EVP_MD_CTX* h, const ValPtr& v);
 
-	[[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]]
-	explicit HashVal(OpaqueType* t);
 	explicit HashVal(OpaqueTypePtr t);
 
 	virtual bool DoInit();
@@ -378,14 +374,3 @@ private:
 };
 
 } // namespace zeek
-
-using OpaqueMgr [[deprecated("Remove in v4.1. Use zeek::OpaqueMgr instead.")]] = zeek::OpaqueMgr;
-using OpaqueVal [[deprecated("Remove in v4.1. Use zeek::OpaqueVal instead.")]] = zeek::OpaqueVal;
-using HashVal [[deprecated("Remove in v4.1. Use zeek::HashVal instead.")]] = zeek::HashVal;
-using MD5Val [[deprecated("Remove in v4.1. Use zeek::MD5Val instead.")]] = zeek::MD5Val;
-using SHA1Val [[deprecated("Remove in v4.1. Use zeek::SHA1Val instead.")]] = zeek::SHA1Val;
-using SHA256Val [[deprecated("Remove in v4.1. Use zeek::SHA256Val instead.")]] = zeek::SHA256Val;
-using EntropyVal [[deprecated("Remove in v4.1. Use zeek::EntropyVal instead.")]] = zeek::EntropyVal;
-using BloomFilterVal [[deprecated("Remove in v4.1. Use zeek::BloomFilterVal instead.")]] = zeek::BloomFilterVal;
-using CardinalityVal [[deprecated("Remove in v4.1. Use zeek::CardinalityVal instead.")]] = zeek::CardinalityVal;
-using ParaglobVal [[deprecated("Remove in v4.1. Use zeek::ParaglobVal instead.")]] = zeek::ParaglobVal;

src/PacketFilter.h

@@ -51,5 +51,3 @@ private:
 };
 
 } // namespace zeek::detail
-
-using PacketFilter [[deprecated("Remove in v4.1. Use zeek::detail::PacketFilter.")]] = zeek::detail::PacketFilter;

src/PrefixTable.h

@@ -65,5 +65,3 @@ private:
 };
 
 } // namespace zeek::detail
-
-using PrefixTable [[deprecated("Remove in v4.1. Use zeek::detail::PrefixTable.")]] = zeek::detail::PrefixTable;

src/PriorityQueue.h

@@ -101,6 +101,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using PQ_Element [[deprecated("Remove in v4.1. Use zeek::detail::PQ_Element.")]] = zeek::detail::PQ_Element;
-using PriorityQueue [[deprecated("Remove in v4.1. Use zeek::detail::PriorityQueue.")]] = zeek::detail::PriorityQueue;

src/Queue.h

@@ -200,6 +200,3 @@ template<typename T>
 using PQueue = Queue<T*>;
 
 } // namespace zeek
-
-template<typename T> using Queue [[deprecated("Remove in v4.1. Use zeek::Queue instead.")]] = zeek::Queue<T>;
-template<typename T> using PQueue [[deprecated("Remove in v4.1. Use zeek::Queue instead.")]] = zeek::PQueue<T>;

src/RE.cc

@@ -13,13 +13,9 @@
 #include "zeek/ZeekString.h"
 
 zeek::detail::CCL* zeek::detail::curr_ccl = nullptr;
-zeek::detail::CCL*& curr_ccl = zeek::detail::curr_ccl;
 zeek::detail::Specific_RE_Matcher* zeek::detail::rem = nullptr;
-zeek::detail::Specific_RE_Matcher*& rem = zeek::detail::rem;
 zeek::detail::NFA_Machine* zeek::detail::nfa = nullptr;
-zeek::detail::NFA_Machine*& nfa = zeek::detail::nfa;
 int zeek::detail::case_insensitive = 0;
-int& case_insensitive = zeek::detail::case_insensitive;
 
 extern int RE_parse(void);
 extern void RE_set_input(const char* str);

src/RE.h

@@ -14,9 +14,6 @@
 
 typedef int (*cce_func)(int);
 
-namespace zeek { class String; }
-using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(NFA_Machine, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(DFA_Machine, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(DFA_State, zeek::detail);
@@ -28,6 +25,9 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(CCL, zeek::detail);
 extern int re_lex(void);
 
 namespace zeek {
+
+class String;
+
 namespace detail {
 
 extern int case_insensitive;
@@ -240,25 +240,3 @@ protected:
 };
 
 } // namespace zeek
-
-constexpr auto clower [[deprecated("Remove in v4.1. Use zeek::detail::clower.")]] = zeek::detail::clower;
-constexpr auto synerr [[deprecated("Remove in v4.1. Use zeek::detail::synerr.")]] = zeek::detail::synerr;
-
-using AcceptIdx [[deprecated("Remove in v4.1. Use zeek::detail::AcceptIdx.")]] = zeek::detail::AcceptIdx;
-using AcceptingSet [[deprecated("Remove in v4.1. Use zeek::detail::AcceptingSet.")]] = zeek::detail::AcceptingSet;
-using MatchPos [[deprecated("Remove in v4.1. Use zeek::detail::MatchPos.")]] = zeek::detail::MatchPos;
-using AcceptingMatchSet [[deprecated("Remove in v4.1. Use zeek::detail::AcceptingMatchSet.")]] = zeek::detail::AcceptingMatchSet;
-using string_list [[deprecated("Remove in v4.1. Use zeek::detail::string_list.")]] = zeek::detail::string_list;
-
-constexpr auto MATCH_ANYWHERE [[deprecated("Remove in v4.1. Use zeek::detail::MATCH_ANYWHERE.")]] = zeek::detail::MATCH_ANYWHERE;
-constexpr auto MATCH_EXACTLY [[deprecated("Remove in v4.1. Use zeek::detail::MATCH_EXACTLY.")]] = zeek::detail::MATCH_EXACTLY;
-
-using Specific_RE_Matcher [[deprecated("Remove in v4.1. Use zeek::detail::Specific_RE_Matcher.")]] = zeek::detail::Specific_RE_Matcher;
-using RE_Match_State [[deprecated("Remove in v4.1. Use zeek::detail::RE_Match_State.")]] = zeek::detail::RE_Match_State;
-using RE_Matcher [[deprecated("Remove in v4.1. Use zeek::RE_Matcher.")]] = zeek::RE_Matcher;
-
-extern int& case_insensitive [[deprecated("Remove in v4.1. Use zeek::detail::case_insensitive")]];
-extern zeek::detail::CCL*& curr_ccl [[deprecated("Remove in v4.1. Use zeek::detail::curr_ccl")]];;
-extern zeek::detail::NFA_Machine*& nfa [[deprecated("Remove in v4.1. Use zeek::detail::nfa")]];;
-extern zeek::detail::Specific_RE_Matcher*& rem [[deprecated("Remove in v4.1. Use zeek::detail::rem")]];;
-extern const char*& RE_parse_input [[deprecated("Remove in v4.1. Use zeek::detail::RE_parse_input")]];;

src/Reassem.h

@@ -315,15 +315,3 @@ protected:
 };
 
 } // namespace zeek
-
-using ReassemblerType [[deprecated("Remove in v4.1. Use zeek::ReassemblerType.")]] = zeek::ReassemblerType;
-constexpr auto REASSEM_UNKNOWN [[deprecated("Remove in v4.1. Use zeek::REASSEM_UNKNOWN.")]] = zeek::REASSEM_UNKNOWN;
-constexpr auto REASSEM_TCP [[deprecated("Remove in v4.1. Use zeek::REASSEM_TCP.")]] = zeek::REASSEM_TCP;
-constexpr auto REASSEM_FRAG [[deprecated("Remove in v4.1. Use zeek::REASSEM_FRAG.")]] = zeek::REASSEM_FRAG;
-constexpr auto REASSEM_FILE [[deprecated("Remove in v4.1. Use zeek::REASSEM_FILE.")]] = zeek::REASSEM_FILE;
-constexpr auto REASSEM_NUM [[deprecated("Remove in v4.1. Use zeek::REASSEM_NUM.")]] = zeek::REASSEM_NUM;
-
-using DataBlock [[deprecated("Remove in v4.1. Use zeek::DataBlock.")]] = zeek::DataBlock;
-using DataBlockMap [[deprecated("Remove in v4.1. Use zeek::DataBlockMap.")]] = zeek::DataBlockMap;
-using DataBlockList [[deprecated("Remove in v4.1. Use zeek::DataBlockList.")]] = zeek::DataBlockList;
-using Reassembler [[deprecated("Remove in v4.1. Use zeek::Reassembler.")]] = zeek::Reassembler;

src/Reporter.h

@@ -321,9 +321,3 @@ private:
 extern Reporter* reporter;
 
 } // namespace zeek
-
-using Reporter [[deprecated("Remove in v4.1. Use zeek::Reporter.")]] = zeek::Reporter;
-using ReporterException [[deprecated("Remove in v4.1. Use zeek::ReporterException.")]] = zeek::ReporterException;
-using InterpreterException [[deprecated("Remove in v4.1. Use zeek::InterpreterException.")]] = zeek::InterpreterException;
-
-extern zeek::Reporter*& reporter [[deprecated("Remove v4.1. Use zeek::reporter.")]];

src/Rule.h

@@ -111,7 +111,3 @@ private:
 	};
 
 } // namespace zeek::detail
-
-using Rule [[deprecated("Remove in v4.1. Use zeek::detail::Rule.")]] = zeek::detail::Rule;
-using rule_list [[deprecated("Remove in v4.1. Use zeek::detail::rule_list.")]] = zeek::detail::rule_list;
-using rule_dict [[deprecated("Remove in v4.1. Use zeek::detail::rule_dict.")]] = zeek::detail::rule_dict;

src/RuleAction.h

@@ -99,10 +99,3 @@ public:
 };
 
 } // namespace zeek::detail
-
-using RuleAction [[deprecated("Remove in v4.1. Use zeek::detail::RuleAction.")]] = zeek::detail::RuleAction;
-using RuleActionEvent [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionEvent.")]] = zeek::detail::RuleActionEvent;
-using RuleActionMIME [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionMIME.")]] = zeek::detail::RuleActionMIME;
-using RuleActionAnalyzer [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionAnalyzer.")]] = zeek::detail::RuleActionAnalyzer;
-using RuleActionEnable [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionEnable.")]] = zeek::detail::RuleActionEnable;
-using RuleActionDisable [[deprecated("Remove in v4.1. Use zeek::detail::RuleActionDisable.")]] = zeek::detail::RuleActionDisable;

src/RuleCondition.h

@@ -124,10 +124,3 @@ private:
 };
 
 } // namespace zeek::detail
-
-using RuleCondition [[deprecated("Remove in v4.1. Use zeek::detail::RuleCondition.")]] = zeek::detail::RuleCondition;
-using RuleConditionTCPState [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionTCPState.")]] = zeek::detail::RuleConditionTCPState;
-using RuleConditionIPOptions [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionIPOptions.")]] = zeek::detail::RuleConditionIPOptions;
-using RuleConditionSameIP [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionSameIP.")]] = zeek::detail::RuleConditionSameIP;
-using RuleConditionPayloadSize [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionPayloadSize.")]] = zeek::detail::RuleConditionPayloadSize;
-using RuleConditionEval [[deprecated("Remove in v4.1. Use zeek::detail::RuleConditionEval.")]] = zeek::detail::RuleConditionEval;

src/RuleMatcher.h

@@ -28,7 +28,6 @@ extern int rules_line_number;
 extern const char* current_rule_file;
 
 namespace zeek { class File; }
-using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
 ZEEK_FORWARD_DECLARE_NAMESPACED(RE_Match_State, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Specific_RE_Matcher, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(RuleMatcher, zeek::detail);
@@ -392,18 +391,3 @@ private:
 };
 
 } // namespace zeek::detail
-
-using Range [[deprecated("Remove in v4.1. Use zeek::detail::Range.")]] = zeek::detail::Range;
-using MaskedValue [[deprecated("Remove in v4.1. Use zeek::detail::MaskedValue.")]] = zeek::detail::MaskedValue;
-using RuleHdrTest [[deprecated("Remove in v4.1. Use zeek::detail::RuleHdrTest.")]] = zeek::detail::RuleHdrTest;
-using RuleEndpointState [[deprecated("Remove in v4.1. Use zeek::detail::RuleEndpointState.")]] = zeek::detail::RuleEndpointState;
-using RuleFileMagicState [[deprecated("Remove in v4.1. Use zeek::detail::RuleFileMagicState.")]] = zeek::detail::RuleFileMagicState;
-using RuleMatcher [[deprecated("Remove in v4.1. Use zeek::detail::RuleMatcher.")]] = zeek::detail::RuleMatcher;
-using RuleMatcherState [[deprecated("Remove in v4.1. Use zeek::detail::RuleMatcherState.")]] = zeek::detail::RuleMatcherState;
-
-using maskedvalue_list [[deprecated("Remove in v4.1. Use zeek::detail::maskedvalue_list.")]] = zeek::detail::maskedvalue_list;
-using string_list [[deprecated("Remove in v4.1. Use zeek::detail::string_list.")]] = zeek::detail::string_list;
-using bstr_list [[deprecated("Remove in v4.1. Use zeek::detail::bstr_list.")]] = zeek::detail::bstr_list;
-using rule_hdr_test_list [[deprecated("Remove in v4.1. Use zeek::detail::rule_hdr_test_list.")]] = zeek::detail::rule_hdr_test_list;
-
-extern zeek::detail::RuleMatcher*& rule_matcher [[deprecated("Remove in v4.1. Use zeek::detail::rule_matcher.")]];

src/RunState.cc

@@ -482,25 +482,3 @@ void continue_processing()
 bool is_processing_suspended()	{ return _processing_suspended; }
 
 } // namespace zeek::run_state
-
-// Remove all of these in v4.1.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-zeek::iosource::PktSrc*& current_pktsrc = zeek::run_state::detail::current_pktsrc;
-#pragma GCC diagnostic pop
-zeek::iosource::IOSource*& current_iosrc = zeek::run_state::detail::current_iosrc;
-zeek::iosource::PktDumper*& pkt_dumper = zeek::run_state::detail::pkt_dumper;
-bool& have_pending_timers = zeek::run_state::detail::have_pending_timers;
-
-bool& reading_live = zeek::run_state::reading_live;
-bool& reading_traces = zeek::run_state::reading_traces;
-double& pseudo_realtime = zeek::run_state::pseudo_realtime;
-double& processing_start_time = zeek::run_state::processing_start_time;
-double& bro_start_time = zeek::run_state::zeek_start_time;
-double& bro_start_network_time = zeek::run_state::zeek_start_network_time;
-bool& terminating = zeek::run_state::terminating;
-bool& is_parsing = zeek::run_state::is_parsing;
-
-const zeek::Packet*& current_pkt = zeek::run_state::current_pkt;
-int& current_dispatched = zeek::run_state::current_dispatched;
-double& current_timestamp = zeek::run_state::current_timestamp;

src/RunState.h

@@ -36,7 +36,6 @@ extern zeek::iosource::PktSrc* current_packet_source();
 
 extern double check_pseudo_time(const Packet *pkt);
 
-extern zeek::iosource::PktSrc* current_pktsrc [[deprecated("Remove in v4.1. Use zeek::run_state::detail::get_current_pktsrc().")]];
 extern zeek::iosource::IOSource* current_iosrc;
 extern zeek::iosource::PktDumper* pkt_dumper;	// where to save packets
 
@@ -105,33 +104,3 @@ extern int current_dispatched;
 extern double current_timestamp;
 
 } // namespace zeek::run_state
-
-constexpr auto net_init [[deprecated("Remove in v4.1. Use zeek::run_state::detail::init_run.")]] = zeek::run_state::detail::init_run;
-constexpr auto net_run [[deprecated("Remove in v4.1. Use zeek::run_state::detail::run_run.")]] = zeek::run_state::detail::run_loop;
-constexpr auto net_get_final_stats [[deprecated("Remove in v4.1. Use zeek::run_state::detail::get_final_stats.")]] = zeek::run_state::detail::get_final_stats;
-constexpr auto net_finish [[deprecated("Remove in v4.1. Use zeek::run_state::detail::finish_run.")]] = zeek::run_state::detail::finish_run;
-constexpr auto net_delete [[deprecated("Remove in v4.1. Use zeek::run_state::detail::delete_run.")]] = zeek::run_state::detail::delete_run;
-constexpr auto net_update_time [[deprecated("Remove in v4.1. Use zeek::run_state::detail::update_network_time.")]] = zeek::run_state::detail::update_network_time;
-constexpr auto net_packet_dispatch [[deprecated("Remove in v4.1. Use zeek::run_state::detail::dispatch_packet.")]] = zeek::run_state::detail::dispatch_packet;
-constexpr auto expire_timers [[deprecated("Remove in v4.1. Use zeek::run_state::detail::expire_timers.")]] = zeek::run_state::detail::expire_timers;
-constexpr auto zeek_terminate_loop [[deprecated("Remove in v4.1. Use zeek::run_state::detail::zeek_terminate_loop.")]] = zeek::run_state::detail::zeek_terminate_loop;
-extern zeek::iosource::PktSrc*& current_pktsrc [[deprecated("Remove in v4.1. Use zeek::run_state::detail::get_current_pktsrc().")]];
-extern zeek::iosource::IOSource*& current_iosrc [[deprecated("Remove in v4.1. Use zeek::run_state::detail::current_iosrc.")]];
-extern zeek::iosource::PktDumper*& pkt_dumper [[deprecated("Remove in v4.1. Use zeek::run_state::detail::pkt_dumper.")]];
-extern bool& have_pending_timers [[deprecated("Remove in v4.1. Use zeek::run_state::detail::have_pending_timers.")]];
-
-constexpr auto net_suspend_processing [[deprecated("Remove in v4.1. Use zeek::run_state::suspend_processing.")]] = zeek::run_state::suspend_processing;
-constexpr auto net_continue_processing [[deprecated("Remove in v4.1. Use zeek::run_state::continue_processing.")]] = zeek::run_state::continue_processing;
-constexpr auto net_is_processing_suspended [[deprecated("Remove in v4.1. Use zeek::run_state::is_processing_suspended.")]] = zeek::run_state::is_processing_suspended;
-
-extern bool& reading_live [[deprecated("Remove in v4.1. Use zeek::run_state::reading_live.")]];
-extern bool& reading_traces [[deprecated("Remove in v4.1. Use zeek::run_state::reading_traces.")]];
-extern double& pseudo_realtime [[deprecated("Remove in v4.1. Use zeek::run_state::pseudo_realtime.")]];
-extern double& processing_start_time [[deprecated("Remove in v4.1. Use zeek::run_state::processing_start_time.")]];
-extern double& bro_start_time [[deprecated("Remove in v4.1. Use zeek::run_state::zeek_start_time.")]];
-extern double& bro_start_network_time [[deprecated("Remove in v4.1. Use zeek::run_state::zeek_start_network_time.")]];
-extern bool& terminating [[deprecated("Remove in v4.1. Use zeek::run_state::terminating.")]];
-extern bool& is_parsing [[deprecated("Remove in v4.1. Use zeek::run_state::is_parsing.")]];
-extern const zeek::Packet*& current_pkt [[deprecated("Remove in v4.1. Use zeek::run_state::current_pkt.")]];
-extern int& current_dispatched [[deprecated("Remove in v4.1. Use zeek::run_state::current_dispatched.")]];
-extern double& current_timestamp [[deprecated("Remove in v4.1. Use zeek::run_state::current_timestamp.")]];

src/ScannedFile.cc

@@ -51,6 +51,3 @@ bool ScannedFile::AlreadyScanned() const
 	}
 
 } // namespace zeek::detail
-
-std::list<zeek::detail::ScannedFile>& files_scanned = zeek::detail::files_scanned;
-std::vector<std::string>& sig_files = zeek::detail::sig_files;

src/ScannedFile.h

@@ -37,7 +37,3 @@ extern std::list<ScannedFile> files_scanned;
 extern std::vector<std::string> sig_files;
 
 } // namespace zeek::detail
-
-using ScannedFile [[deprecated("Remove in v4.1. Use zeek::detail::ScannedFile.")]] = zeek::detail::ScannedFile;
-extern std::list<zeek::detail::ScannedFile>& files_scanned [[deprecated("Remove in v4.1. Use zeek::detail::files_scanned.")]];
-extern std::vector<std::string>& sig_files [[deprecated("Remove in v4.1. Use zeek::detail::sig_files.")]];

src/Scope.cc

@@ -209,12 +209,3 @@ Scope* global_scope()
 	}
 
 } // namespace zeek::detail
-
-zeek::detail::ID* lookup_ID(
-	const char* name, const char* module,
-	bool no_global,
-	bool same_module_only,
-	bool check_export)
-	{
-	return zeek::detail::lookup_ID(name, module, no_global, same_module_only, check_export).get();
-	}

src/Scope.h

@@ -13,7 +13,6 @@
 #include "zeek/TraverseTypes.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Type, zeek);
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
@@ -38,11 +37,6 @@ public:
 
 	const IDPtr& Find(std::string_view name) const;
 
-	template<typename N>
-	[[deprecated("Remove in v4.1.  Use Find().")]]
-	ID* Lookup(N&& name) const
-		{ return Find(name).get(); }
-
 	template<typename N, typename I>
 	void Insert(N&& name, I&& id)
 		{
@@ -50,18 +44,12 @@ public:
 		ordered_vars.push_back(std::forward<I>(id));
 		}
 
-	[[deprecated("Remove in v4.1.  Use GetID().")]]
-	ID* ScopeID() const		{ return scope_id.get(); }
-
 	const IDPtr& GetID() const
 		{ return scope_id; }
 
 	const std::unique_ptr<std::vector<AttrPtr>>& Attrs() const
 		{ return attrs; }
 
-	[[deprecated("Remove in v4.1.  Use GetReturnTrype().")]]
-	Type* ReturnType() const	{ return return_type.get(); }
-
 	const TypePtr& GetReturnType() const
 		{ return return_type; }
 
@@ -124,21 +112,3 @@ extern std::string current_module;
 } // namespace zeek
 
 extern bool in_debug;
-
-using Scope [[deprecated("Remove in v4.1. Use zeek::detail::Scope instead.")]] = zeek::detail::Scope;
-extern std::string& current_module [[deprecated("Remove in v4.1. Use zeek::detail::current_module.")]];
-
-constexpr auto install_ID [[deprecated("Remove in v4.1 Use zeek::detail::install_ID instead.")]] = zeek::detail::install_ID;
-constexpr auto push_scope [[deprecated("Remove in v4.1 Use zeek::detail::push_scope instead.")]] = zeek::detail::push_scope;
-constexpr auto push_existing_scope[[deprecated("Remove in v4.1 Use zeek::detail::push_existing_scope instead.")]] = zeek::detail::push_existing_scope;
-constexpr auto pop_scope [[deprecated("Remove in v4.1 Use zeek::detail::pop_scope instead.")]] = zeek::detail::pop_scope;
-constexpr auto current_scope [[deprecated("Remove in v4.1 Use zeek::detail::current_scope instead.")]] = zeek::detail::current_scope;
-constexpr auto global_scope [[deprecated("Remove in v4.1 Use zeek::detail::global_scope instead.")]] = zeek::detail::global_scope;
-
-// Because of the use of default arguments, this function can't be aliased like the rest.
-[[deprecated("Remove in v4.1 Use zeek::detail::lookup_ID instead.")]]
-extern zeek::detail::ID* lookup_ID(
-	const char* name, const char* module,
-	bool no_global = false,
-	bool same_module_only = false,
-	bool check_export = true);

src/ScriptCoverageManager.h

@@ -87,6 +87,3 @@ private:
 extern ScriptCoverageManager script_coverage_mgr;
 
 } // namespace zeek::detail
-
-using Brofiler [[deprecated("Remove in v4.1. Use zeek::detail::ScriptCoverageManager.")]] = zeek::detail::ScriptCoverageManager;
-extern zeek::detail::ScriptCoverageManager& brofiler [[deprecated("Remove in v4.1. Use zeek::detail::brofiler.")]];

src/SerializationFormat.h

@@ -138,6 +138,3 @@ public:
 };
 
 } // namespace zeek::detail
-
-using SerializationFormat [[deprecated("Remove in v4.1. Use zeek::detail::SerializationFormat.")]] = zeek::detail::SerializationFormat;
-using BinarySerializationFormat [[deprecated("Remove in v4.1. Use zeek::detail::BinarySerializationFormat.")]] = zeek::detail::BinarySerializationFormat;

src/Sessions.cc

@@ -74,11 +74,6 @@ void NetSessions::Done()
 	{
 	}
 
-void NetSessions::NextPacket(double t, Packet* pkt)
-	{
-	packet_mgr->ProcessPacket(pkt);
-	}
-
 void NetSessions::ProcessTransportLayer(double t, const Packet* pkt, size_t remaining)
 	{
 	const std::unique_ptr<IP_Hdr>& ip_hdr = pkt->ip_hdr;

src/Sessions.h

@@ -16,13 +16,12 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Packet, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek);
 class ConnCompressor;
 
-namespace zeek { struct ConnID; }
-using ConnID [[deprecated("Remove in v4.1. Use zeek::ConnID.")]] = zeek::ConnID;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(SteppingStoneManager, zeek, analyzer::stepping_stone);
 
 namespace zeek {
 
+struct ConnID;
+
 struct SessionStats {
 	size_t num_TCP_conns;
 	size_t max_TCP_conns;
@@ -46,10 +45,6 @@ public:
 	NetSessions();
 	~NetSessions();
 
-	// Main entry point for packet processing.
-	[[deprecated("Remove in v4.1. Do not call this method directly. Packet processing should start with a call to packet_mgr->ProcessPacket().")]]
-	void NextPacket(double t, Packet* pkt);
-
 	void Done();	// call to drain events before destructing
 
 	// Looks up the connection referred to by the given Val,
@@ -184,9 +179,3 @@ protected:
 extern NetSessions* sessions;
 
 } // namespace zeek
-
-using SessionStats [[deprecated("Remove in v4.1. Use zeek::SessionStats.")]] = zeek::SessionStats;
-using NetSessions [[deprecated("Remove in v4.1. Use zeek::NetSessions.")]] = zeek::NetSessions;
-using FragReassemblerTracker [[deprecated("Remove in v4.1. Use zeek::detail::FragReassemblerTracker.")]] = zeek::detail::FragReassemblerTracker;
-
-extern zeek::NetSessions*& sessions [[deprecated("Remove in v4.1. Use zeek:sessions.")]];

src/SmithWaterman.h

@@ -151,11 +151,3 @@ extern Substring::Vec* smith_waterman(const String* s1,
                                       SWParams& params);
 
 } // namespace zeek::detail
-
-using BroSubstring [[deprecated("Remove in v4.1. Use zeek::detail::Substring.")]] = zeek::detail::Substring;
-using BroSubstringCmp [[deprecated("Remove in v4.1 Use zeel::detail::SubstringCmp.")]] = zeek::detail::SubstringCmp;
-using SWParams [[deprecated("Remove in v4.1. Use zeek::detail::SWParams.")]] = zeek::detail::SWParams;
-
-constexpr auto SW_SINGLE [[deprecated("Remove in v4.1. Use zeek::detai::SW_SINGLE.")]] = zeek::detail::SW_SINGLE;
-constexpr auto SW_MULTIPLE [[deprecated("Remove in v4.1. Use zeek::detai::SW_MULTIPLE.")]] = zeek::detail::SW_MULTIPLE;
-constexpr auto smith_waterman [[deprecated("Remove in v4.1. Use zeek::detail::smith_waterman.")]] = zeek::detail::smith_waterman;

src/Stats.h

@@ -10,7 +10,6 @@
 #include <stdint.h>
 
 namespace zeek { class File; }
-using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(TableVal, zeek);
@@ -144,22 +143,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using SegmentStatsReporter [[deprecated("Remove in v4.1. Use zeek::detail::SegmentStatsReporter.")]] = zeek::detail::SegmentStatsReporter;
-using SegmentProfiler [[deprecated("Remove in v4.1. Use zeek::detail::SegmentProfiler.")]] = zeek::detail::SegmentProfiler;
-using ProfileLogger [[deprecated("Remove in v4.1. Use zeek::detail::ProfileLogger.")]] = zeek::detail::ProfileLogger;
-using SampleLogger [[deprecated("Remove in v4.1. Use zeek::detail::SampleLogger.")]] = zeek::detail::SampleLogger;
-using PacketProfiler [[deprecated("Remove in v4.1. Use zeek::detail::PacketProfiler.")]] = zeek::detail::PacketProfiler;
-
-extern zeek::detail::ProfileLogger*& profiling_logger [[deprecated("Remove in v4.1. Use zeek::detail::profiling_logger.")]];
-extern zeek::detail::ProfileLogger*& segment_logger [[deprecated("Remove in v4.1. Use zeek::detail::segment_logger.")]];
-extern zeek::detail::SampleLogger*& sample_logger [[deprecated("Remove in v4.1. Use zeek::detail::sample_logger.")]];
-
-// Connection statistics.
-extern uint64_t& killed_by_inactivity [[deprecated("Remove in v4.1. Use zeek::detail::killed_by_inactivity.")]];
-
-// Content gap statistics.
-extern uint64_t& tot_ack_events [[deprecated("Remove in v4.1. Use zeek::detail::tot_ack_events.")]];
-extern uint64_t& tot_ack_bytes [[deprecated("Remove in v4.1. Use zeek::detail::tot_ack_bytes.")]];
-extern uint64_t& tot_gap_events [[deprecated("Remove in v4.1. Use zeek::detail::tot_gap_events.")]];
-extern uint64_t& tot_gap_bytes [[deprecated("Remove in v4.1. Use zeek::detail::tot_gap_bytes.")]];

src/Stmt.h

@@ -611,23 +611,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using ExprListStmt [[deprecated("Remove in v4.1. Use zeek::detail::ExprListStmt instead.")]] = zeek::detail::ExprListStmt;
-using PrintStmt [[deprecated("Remove in v4.1. Use zeek::detail::PrintStmt instead.")]] = zeek::detail::PrintStmt;
-using ExprStmt [[deprecated("Remove in v4.1. Use zeek::detail::ExprStmt instead.")]] = zeek::detail::ExprStmt;
-using IfStmt [[deprecated("Remove in v4.1. Use zeek::detail::IfStmt instead.")]] = zeek::detail::IfStmt;
-using Case [[deprecated("Remove in v4.1. Use zeek::detail::Case instead.")]] = zeek::detail::Case;
-using SwitchStmt [[deprecated("Remove in v4.1. Use zeek::detail::SwitchStmt instead.")]] = zeek::detail::SwitchStmt;
-using AddStmt [[deprecated("Remove in v4.1. Use zeek::detail::AddStmt instead.")]] = zeek::detail::AddStmt;
-using DelStmt [[deprecated("Remove in v4.1. Use zeek::detail::DelStmt instead.")]] = zeek::detail::DelStmt;
-using EventStmt [[deprecated("Remove in v4.1. Use zeek::detail::EventStmt instead.")]] = zeek::detail::EventStmt;
-using WhileStmt [[deprecated("Remove in v4.1. Use zeek::detail::WhileStmt instead.")]] = zeek::detail::WhileStmt;
-using ForStmt [[deprecated("Remove in v4.1. Use zeek::detail::ForStmt instead.")]] = zeek::detail::ForStmt;
-using NextStmt [[deprecated("Remove in v4.1. Use zeek::detail::NextStmt instead.")]] = zeek::detail::NextStmt;
-using BreakStmt [[deprecated("Remove in v4.1. Use zeek::detail::BreakStmt instead.")]] = zeek::detail::BreakStmt;
-using FallthroughStmt [[deprecated("Remove in v4.1. Use zeek::detail::FallthroughStmt instead.")]] = zeek::detail::FallthroughStmt;
-using ReturnStmt [[deprecated("Remove in v4.1. Use zeek::detail::ReturnStmt instead.")]] = zeek::detail::ReturnStmt;
-using StmtList [[deprecated("Remove in v4.1. Use zeek::detail::StmtList instead.")]] = zeek::detail::StmtList;
-using InitStmt [[deprecated("Remove in v4.1. Use zeek::detail::InitStmt instead.")]] = zeek::detail::InitStmt;
-using NullStmt [[deprecated("Remove in v4.1. Use zeek::detail::NullStmt instead.")]] = zeek::detail::NullStmt;
-using WhenStmt [[deprecated("Remove in v4.1. Use zeek::detail::WhenStmt instead.")]] = zeek::detail::WhenStmt;

src/StmtBase.h

@@ -177,5 +177,3 @@ protected:
 };
 
 } // namespace zeek::detail
-
-using Stmt [[deprecated("Remove in v4.1. Use zeek::detail::Stmt instead.")]] = zeek::detail::Stmt;

src/StmtEnums.h

@@ -35,34 +35,3 @@ enum StmtFlowType {
 extern const char* stmt_name(StmtTag t);
 
 } // namespace zeek::detail
-
-using BroStmtTag [[deprecated("Remove in v4.1. Use zeek::detail::StmtTag.")]] = zeek::detail::StmtTag;
-constexpr auto STMT_ANY [[deprecated("Remove in v4.1. Use zeek::detail::STMT_ANY.")]] = zeek::detail::STMT_ANY;
-constexpr auto STMT_ALARM [[deprecated("Remove in v4.1. Use zeek::detail::STMT_ALARM.")]] = zeek::detail::STMT_ALARM;
-constexpr auto STMT_PRINT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_PRINT.")]] = zeek::detail::STMT_PRINT;
-constexpr auto STMT_EVENT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_EVENT.")]] = zeek::detail::STMT_EVENT;
-constexpr auto STMT_EXPR [[deprecated("Remove in v4.1. Use zeek::detail::STMT_EXPR.")]] = zeek::detail::STMT_EXPR;
-constexpr auto STMT_IF [[deprecated("Remove in v4.1. Use zeek::detail::STMT_IF.")]] = zeek::detail::STMT_IF;
-constexpr auto STMT_WHEN [[deprecated("Remove in v4.1. Use zeek::detail::STMT_WHEN.")]] = zeek::detail::STMT_WHEN;
-constexpr auto STMT_SWITCH [[deprecated("Remove in v4.1. Use zeek::detail::STMT_SWITCH.")]] = zeek::detail::STMT_SWITCH;
-constexpr auto STMT_FOR [[deprecated("Remove in v4.1. Use zeek::detail::STMT_FOR.")]] = zeek::detail::STMT_FOR;
-constexpr auto STMT_NEXT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_NEXT.")]] = zeek::detail::STMT_NEXT;
-constexpr auto STMT_BREAK [[deprecated("Remove in v4.1. Use zeek::detail::STMT_BREAK.")]] = zeek::detail::STMT_BREAK;
-constexpr auto STMT_RETURN [[deprecated("Remove in v4.1. Use zeek::detail::STMT_RETURN.")]] = zeek::detail::STMT_RETURN;
-constexpr auto STMT_ADD [[deprecated("Remove in v4.1. Use zeek::detail::STMT_ADD.")]] = zeek::detail::STMT_ADD;
-constexpr auto STMT_DELETE [[deprecated("Remove in v4.1. Use zeek::detail::STMT_DELETE.")]] = zeek::detail::STMT_DELETE;
-constexpr auto STMT_LIST [[deprecated("Remove in v4.1. Use zeek::detail::STMT_LIST.")]] = zeek::detail::STMT_LIST;
-constexpr auto STMT_EVENT_BODY_LIST [[deprecated("Remove in v4.1. Use zeek::detail::STMT_EVENT_BODY_LIST.")]] = zeek::detail::STMT_EVENT_BODY_LIST;
-constexpr auto STMT_INIT [[deprecated("Remove in v4.1. Use zeek::detail::STMT_INIT.")]] = zeek::detail::STMT_INIT;
-constexpr auto STMT_FALLTHROUGH [[deprecated("Remove in v4.1. Use zeek::detail::STMT_FALLTHROUGH.")]] = zeek::detail::STMT_FALLTHROUGH;
-constexpr auto STMT_WHILE [[deprecated("Remove in v4.1. Use zeek::detail::STMT_WHILE.")]] = zeek::detail::STMT_WHILE;
-constexpr auto STMT_NULL [[deprecated("Remove in v4.1. Use zeek::detail::STMT_NULL.")]] = zeek::detail::STMT_NULL;
-
-using stmt_flow_type [[deprecated("Remove in v4.1. Use zeek::detail::StmtFlowType.")]] = zeek::detail::StmtFlowType;
-constexpr auto FLOW_NEXT [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_NEXT.")]] = zeek::detail::FLOW_NEXT;
-constexpr auto FLOW_LOOP [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_LOOP.")]] = zeek::detail::FLOW_LOOP;
-constexpr auto FLOW_BREAK [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_BREAK.")]] = zeek::detail::FLOW_BREAK;
-constexpr auto FLOW_RETURN [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_RETURN.")]] = zeek::detail::FLOW_RETURN;
-constexpr auto FLOW_FALLTHROUGH [[deprecated("Remove in v4.1. Use zeek::detail::FLOW_FALLTHROUGH.")]] = zeek::detail::FLOW_FALLTHROUGH;
-
-constexpr auto stmt_name [[deprecated("Remove in v4.1. Use zeek::detail::stmt_name.")]] = zeek::detail::stmt_name;

src/Tag.cc

@@ -15,10 +15,6 @@ Tag::Tag(const EnumTypePtr& etype, type_t arg_type, subtype_t arg_subtype)
 	val = etype->GetEnumVal(i);
 	}
 
-Tag::Tag(EnumType* etype, type_t arg_type, subtype_t arg_subtype)
-	: Tag({NewRef{}, etype}, arg_type, arg_subtype)
-	{ }
-
 Tag::Tag(EnumValPtr arg_val)
 	{
 	assert(arg_val);
@@ -30,10 +26,6 @@ Tag::Tag(EnumValPtr arg_val)
 	subtype = (i >> 31) & 0xffffffff;
 	}
 
-Tag::Tag(EnumVal* arg_val)
-	: Tag({NewRef{}, arg_val})
-	{ }
-
 Tag::Tag(const Tag& other)
 	{
 	type = other.type;
@@ -85,11 +77,6 @@ const EnumValPtr& Tag::AsVal(const EnumTypePtr& etype) const
 	return val;
 	}
 
-EnumVal* Tag::AsEnumVal(EnumType* etype) const
-	{
-	return AsVal({NewRef{}, etype}).get();
-	}
-
 std::string Tag::AsString() const
 	{
 	return util::fmt("%" PRIu32 "/%" PRIu32, type, subtype);

src/Tag.h

@@ -123,9 +123,6 @@ protected:
 	 */
 	const EnumValPtr& AsVal(const EnumTypePtr& etype) const;
 
-	[[deprecated("Remove in v4.1.  Use AsVal() instead.")]]
-	EnumVal* AsEnumVal(EnumType* etype) const;
-
 	/**
 	 * Constructor.
 	 *
@@ -139,9 +136,6 @@ protected:
 	 */
 	Tag(const EnumTypePtr& etype, type_t type, subtype_t subtype = 0);
 
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtr& instead.")]]
-	Tag(EnumType* etype, type_t type, subtype_t subtype = 0);
-
 	/**
 	 * Constructor.
 	 *
@@ -149,9 +143,6 @@ protected:
 	 */
 	explicit Tag(EnumValPtr val);
 
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtr instead.")]]
-	explicit Tag(EnumVal* val);
-
 private:
 	type_t type;            // Main type.
 	subtype_t subtype;      // Subtype.
@@ -159,5 +150,3 @@ private:
 };
 
 } // namespace zeek
-
-using Tag [[deprecated("Remove in v4.1. Use zeek::Tag instead")]] = zeek::Tag;

src/Timer.h

@@ -174,43 +174,3 @@ protected:
 extern TimerMgr* timer_mgr;
 
 } // namespace zeek::detail
-
-using TimerType [[deprecated("Remove in v4.1. Use zeek::detail::TimerType.")]] = zeek::detail::TimerType;
-using Timer [[deprecated("Remove in v4.1. Use zeek::detail::Timer.")]] = zeek::detail::Timer;
-using TimerMgr [[deprecated("Remove in v4.1. Use zeek::detail::TimerMgr.")]] = zeek::detail::TimerMgr;
-using PQ_TimerMgr [[deprecated("Remove in v4.1. Use zeek::detail::PQ_TimerMgr.")]] = zeek::detail::PQ_TimerMgr;
-extern zeek::detail::TimerMgr*& timer_mgr [[deprecated("Remove in v4.1. Use zeek::detail::timer_mgr.")]];
-
-constexpr auto TIMER_BACKDOOR [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_BACKDOOR.")]] = zeek::detail::TIMER_BACKDOOR;
-constexpr auto TIMER_BREAKPOINT [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_BREAKPOINT.")]] = zeek::detail::TIMER_BREAKPOINT;
-constexpr auto TIMER_CONN_DELETE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_DELETE.")]] = zeek::detail::TIMER_CONN_DELETE;
-constexpr auto TIMER_CONN_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_EXPIRE.")]] = zeek::detail::TIMER_CONN_EXPIRE;
-constexpr auto TIMER_CONN_INACTIVITY [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_INACTIVITY.")]] = zeek::detail::TIMER_CONN_INACTIVITY;
-constexpr auto TIMER_CONN_STATUS_UPDATE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_STATUS_UPDATE.")]] = zeek::detail::TIMER_CONN_STATUS_UPDATE;
-constexpr auto TIMER_CONN_TUPLE_WEIRD_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_CONN_TUPLE_WEIRD_EXPIRE.")]] = zeek::detail::TIMER_CONN_TUPLE_WEIRD_EXPIRE;
-constexpr auto TIMER_DNS_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_DNS_EXPIRE.")]] = zeek::detail::TIMER_DNS_EXPIRE;
-constexpr auto TIMER_FILE_ANALYSIS_INACTIVITY [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_FILE_ANALYSIS_INACTIVITY.")]] = zeek::detail::TIMER_FILE_ANALYSIS_INACTIVITY;
-constexpr auto TIMER_FLOW_WEIRD_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_FLOW_WEIRD_EXPIRE.")]] = zeek::detail::TIMER_FLOW_WEIRD_EXPIRE;
-constexpr auto TIMER_FRAG [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_FRAG.")]] = zeek::detail::TIMER_FRAG;
-constexpr auto TIMER_INTERCONN [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_INTERCONN.")]] = zeek::detail::TIMER_INTERCONN;
-constexpr auto TIMER_IP_TUNNEL_INACTIVITY [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_IP_TUNNEL_INACTIVITY.")]] = zeek::detail::TIMER_IP_TUNNEL_INACTIVITY;
-constexpr auto TIMER_NB_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NB_EXPIRE.")]] = zeek::detail::TIMER_NB_EXPIRE;
-constexpr auto TIMER_NET_WEIRD_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NET_WEIRD_EXPIRE.")]] = zeek::detail::TIMER_NET_WEIRD_EXPIRE;
-constexpr auto TIMER_NETWORK [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NETWORK.")]] = zeek::detail::TIMER_NETWORK;
-constexpr auto TIMER_NTP_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_NTP_EXPIRE.")]] = zeek::detail::TIMER_NTP_EXPIRE;
-constexpr auto TIMER_PROFILE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_PROFILE.")]] = zeek::detail::TIMER_PROFILE;
-constexpr auto TIMER_ROTATE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_ROTATE.")]] = zeek::detail::TIMER_ROTATE;
-constexpr auto TIMER_REMOVE_CONNECTION [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_REMOVE_CONNECTION.")]] = zeek::detail::TIMER_REMOVE_CONNECTION;
-constexpr auto TIMER_RPC_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_RPC_EXPIRE.")]] = zeek::detail::TIMER_RPC_EXPIRE;
-constexpr auto TIMER_SCHEDULE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_SCHEDULE.")]] = zeek::detail::TIMER_SCHEDULE;
-constexpr auto TIMER_TABLE_VAL [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TABLE_VAL.")]] = zeek::detail::TIMER_TABLE_VAL;
-constexpr auto TIMER_TCP_ATTEMPT [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_ATTEMPT.")]] = zeek::detail::TIMER_TCP_ATTEMPT;
-constexpr auto TIMER_TCP_DELETE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_DELETE.")]] = zeek::detail::TIMER_TCP_DELETE;
-constexpr auto TIMER_TCP_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_EXPIRE.")]] = zeek::detail::TIMER_TCP_EXPIRE;
-constexpr auto TIMER_TCP_PARTIAL_CLOSE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_PARTIAL_CLOSE.")]] = zeek::detail::TIMER_TCP_PARTIAL_CLOSE;
-constexpr auto TIMER_TCP_RESET [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TCP_RESET.")]] = zeek::detail::TIMER_TCP_RESET;
-constexpr auto TIMER_TRIGGER [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TRIGGER.")]] = zeek::detail::TIMER_TRIGGER;
-constexpr auto TIMER_PPID_CHECK [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_PPID_CHECK.")]] = zeek::detail::TIMER_PPID_CHECK;
-constexpr auto TIMER_TIMERMGR_EXPIRE [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_TIMERMGR_EXPIRE.")]] = zeek::detail::TIMER_TIMERMGR_EXPIRE;
-constexpr auto TIMER_THREAD_HEARTBEAT [[deprecated("Remove in v4.1. Use zeek::detail::TIMER_THREAD_HEARTBEAT.")]] = zeek::detail::TIMER_THREAD_HEARTBEAT;
-constexpr auto NUM_TIMER_TYPES [[deprecated("Remove in v4.1. Use zeek::detail::NUM_TIMER_TYPES.")]] = zeek::detail::NUM_TIMER_TYPES;

src/Traverse.h

@@ -41,6 +41,3 @@ public:
 TraversalCode traverse_all(TraversalCallback* cb);
 
 } // namespace zeek::detail
-
-using TraversalCallback [[deprecated("Remove in v4.1. Use zeek::detail::TraversalCallback.")]] = zeek::detail::TraversalCallback;
-constexpr auto traverse_all [[deprecated("Remove in v4.1. Use zeek::detail::traverse_all.")]] = zeek::detail::traverse_all;

src/TraverseTypes.h

@@ -44,8 +44,3 @@ enum TraversalCode {
 	return (code);
 
 } // namespace zeek::detail
-
-using TraversalCode [[deprecated("Remove in v4.1. Use zeek::detail::TraversalCode.")]] = zeek::detail::TraversalCode;
-constexpr auto TC_CONTINUE [[deprecated("Remove in v4.1. Use zeek::detail::TC_CONTINUE.")]] = zeek::detail::TC_CONTINUE;
-constexpr auto TC_ABORTALL [[deprecated("Remove in v4.1. Use zeek::detail::TC_ABORTALL.")]] = zeek::detail::TC_ABORTALL;
-constexpr auto TC_ABORTSTMT [[deprecated("Remove in v4.1. Use zeek::detail::TC_ABORTSTMT.")]] = zeek::detail::TC_ABORTSTMT;

src/Trigger.h

@@ -150,12 +150,3 @@ private:
 extern trigger::Manager* trigger_mgr;
 
 } // namespace zeek::detail
-
-namespace trigger {
-
-using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger.")]] = zeek::detail::trigger::Trigger;
-using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager.")]] = zeek::detail::trigger::Manager;
-
-} // namespace trigger
-
-extern zeek::detail::trigger::Manager*& trigger_mgr [[deprecated("Remove in v4.1. Use zeek::detail::trigger_mgr.")]];

src/TunnelEncapsulation.h

@@ -84,10 +84,6 @@ public:
 	 */
 	RecordValPtr ToVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToVal() instead.")]]
-	RecordVal* GetRecordVal() const
-		{ return ToVal().release(); }
-
 	friend bool operator==(const EncapsulatingConn& ec1,
 	                       const EncapsulatingConn& ec2)
 		{
@@ -211,10 +207,6 @@ public:
 		return vv;
 		}
 
-	[[deprecated("Remove in v4.1.  Use ToVal() instead.")]]
-	VectorVal* GetVectorVal() const
-		{ return ToVal().release(); }
-
 	friend bool operator==(const EncapsulationStack& e1,
 	                       const EncapsulationStack& e2);
 

src/Type.cc

@@ -240,16 +240,6 @@ const TypePtr& Type::Yield() const
 	return Type::nil;
 	}
 
-bool Type::HasField(const char* /* field */) const
-	{
-	return false;
-	}
-
-Type* Type::FieldType(const char* /* field */) const
-	{
-	return nullptr;
-	}
-
 void Type::Describe(ODesc* d) const
 	{
 	if ( d->IsBinary() )
@@ -292,7 +282,6 @@ void TypeList::Append(TypePtr t)
 	if ( pure_type && ! same_type(t, pure_type) )
 		reporter->InternalError("pure type-list violation");
 
-	types_list.push_back(t.get());
 	types.emplace_back(std::move(t));
 	}
 
@@ -301,7 +290,6 @@ void TypeList::AppendEvenIfNotPure(TypePtr t)
 	if ( pure_type && ! same_type(t, pure_type) )
 		pure_type = nullptr;
 
-	types_list.push_back(t.get());
 	types.emplace_back(std::move(t));
 	}
 
@@ -1410,13 +1398,6 @@ const EnumValPtr& EnumType::GetEnumVal(bro_int_t i)
 	return it->second;
 	}
 
-EnumVal* EnumType::GetVal(bro_int_t i)
-	{
-	auto rval = GetEnumVal(i).get();
-	zeek::Ref(rval);
-	return rval;
-	}
-
 void EnumType::DescribeReST(ODesc* d, bool roles_only) const
 	{
 	d->Add(":zeek:type:`enum`");
@@ -1606,10 +1587,6 @@ bool same_type(const Type& arg_t1, const Type& arg_t2,
 	case TYPE_BOOL:
 	case TYPE_INT:
 	case TYPE_COUNT:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	case TYPE_COUNTER:
-#pragma GCC diagnostic pop
 	case TYPE_DOUBLE:
 	case TYPE_TIME:
 	case TYPE_INTERVAL:
@@ -1814,10 +1791,6 @@ bool is_assignable(TypeTag t)
 	case TYPE_BOOL:
 	case TYPE_INT:
 	case TYPE_COUNT:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	case TYPE_COUNTER:
-#pragma GCC diagnostic pop
 	case TYPE_DOUBLE:
 	case TYPE_TIME:
 	case TYPE_INTERVAL:

src/Type.h

@@ -96,10 +96,6 @@ constexpr InternalTypeTag to_internal_type_tag(TypeTag tag) noexcept
 		return TYPE_INTERNAL_INT;
 
 	case TYPE_COUNT:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	case TYPE_COUNTER:
-#pragma GCC diagnostic pop
 	case TYPE_PORT:
 		return TYPE_INTERNAL_UNSIGNED;
 
@@ -205,22 +201,6 @@ public:
 	// type.  Returns nil if this is not an index type.
 	virtual const TypePtr& Yield() const;
 
-	[[deprecated("Remove in v4.1.  Use Yield() instead.")]]
-	virtual Type* YieldType()
-		{ return Yield().get(); }
-	[[deprecated("Remove in v4.1.  Use Yield() instead.")]]
-	virtual const Type* YieldType() const
-		{ return Yield().get(); }
-
-	// Returns true if this type is a record and contains the
-	// given field, false otherwise.
-	[[deprecated("Remove in v4.1.  Use RecordType::HasField() directly.")]]
-	virtual bool HasField(const char* field) const;
-
-	// Returns the type of the given field, or nil if no such field.
-	[[deprecated("Remove in v4.1.  Use RecordType::GetFieldType() directly.")]]
-	virtual Type* FieldType(const char* field) const;
-
 	const TypeList* AsTypeList() const;
 	TypeList* AsTypeList();
 
@@ -302,15 +282,6 @@ public:
 		return it == Type::type_aliases.end() ? empty : it->second;
 		}
 
-	[[deprecated("Remove in v4.1. Use zeek::Type::Aliases() instead.")]]
-	static std::set<Type*> GetAliases(const std::string& type_name)
-		{
-		std::set<Type*> rval;
-		for ( const auto& t : Type::type_aliases[type_name] )
-			rval.emplace(t.get());
-		return rval;
-		}
-
 	/**
 	 * Registers a new type alias.
 	 * @param type_name  the name of the type to register a new alias for.
@@ -326,10 +297,6 @@ public:
 		return it->second.emplace(std::move(type)).second;
 		}
 
-	[[deprecated("Remove in v4.1. Use zeek::Type::RegisterAlias().")]]
-	static void AddAlias(const std::string &type_name, Type* type)
-		{ Type::type_aliases[type_name].insert({NewRef{}, type}); }
-
 protected:
 	Type() = default;
 
@@ -354,10 +321,6 @@ public:
 
 	~TypeList() override = default;
 
-	[[deprecated("Remove in v4.1. Use GetTypes() instead.")]]
-	const TypePList* Types() const
-		{ return &types_list; }
-
 	const std::vector<TypePtr>& GetTypes() const
 		{ return types; }
 
@@ -368,11 +331,6 @@ public:
 	const TypePtr& GetPureType() const
 		{ return pure_type; }
 
-	[[deprecated("Remove in v4.1.  Use GetPureType() instead.")]]
-	Type* PureType()		{ return pure_type.get(); }
-	[[deprecated("Remove in v4.1.  Use GetPureType() instead.")]]
-	const Type* PureType() const	{ return pure_type.get(); }
-
 	// True if all of the types match t, false otherwise.  If
 	// is_init is true, then the matching is done in the context
 	// of an initialization.
@@ -390,9 +348,6 @@ public:
 protected:
 	TypePtr pure_type;
 	std::vector<TypePtr> types;
-
-	// Remove in v4.1. This is used by Types(), which is deprecated.
-	TypePList types_list;
 };
 
 class IndexType : public Type {
@@ -403,18 +358,6 @@ public:
 	const TypeListPtr& GetIndices() const
 		{ return indices; }
 
-	[[deprecated("Remove in v4.1. Use GetIndices().")]]
-	TypeList* Indices() const		{ return indices.get(); }
-
-	[[deprecated("Remove in v4.1. Use GetIndexTypes().")]]
-	const TypePList* IndexTypes() const
-		{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-		return indices->Types();
-#pragma GCC diagnostic pop
-		}
-
 	const std::vector<TypePtr>& GetIndexTypes() const
 		{ return indices->GetTypes(); }
 
@@ -459,9 +402,6 @@ public:
 
 	TypePtr ShallowClone() override;
 
-	[[deprecated("Remove in v4.1.  Use Elements() instead.")]]
-	detail::ListExpr* SetElements() const	{ return elements.get(); }
-
 	const detail::ListExprPtr& Elements() const
 		{ return elements; }
 
@@ -492,9 +432,6 @@ public:
 
 	TypePtr ShallowClone() override;
 
-	[[deprecated("Remove in v4.1.  Use Params().")]]
-	RecordType* Args() const	{ return args.get(); }
-
 	const RecordTypePtr& Params() const
 		{ return args; }
 
@@ -514,9 +451,6 @@ public:
 	bool CheckArgs(const std::vector<TypePtr>& args,
 	               bool is_init = false) const;
 
-	[[deprecated("Remove in v4.1.  Use ParamList().")]]
-	TypeList* ArgTypes() const	{ return arg_types.get(); }
-
 	const TypeListPtr& ParamList() const
 		{ return arg_types; }
 
@@ -589,11 +523,6 @@ public:
 	IntrusivePtr<T> GetType() const
 		{ return cast_intrusive<T>(type); }
 
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	zeek::Type* Type()			{ return type.get(); }
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	const zeek::Type* Type() const	{ return type.get(); }
-
 protected:
 	TypePtr type;
 };
@@ -624,18 +553,7 @@ public:
 
 	~RecordType() override;
 
-	bool HasField(const char* field) const override;
+	bool HasField(const char* field) const;
-
-	[[deprecated("Remove in v4.1.  Use GetFieldType() instead (note it doesn't check for invalid names).")]]
-	Type* FieldType(const char* field) const override
-		{
-		auto offset = FieldOffset(field);
-		return offset >= 0 ? GetFieldType(offset).get() : nullptr;
-		}
-
-	[[deprecated("Remove in v4.1.  Use GetFieldType() instead.")]]
-	Type* FieldType(int field) const
-		{ return GetFieldType(field).get(); }
 
 	/**
 	 * Looks up a field by name and returns its type.  No check for invalid
@@ -789,9 +707,6 @@ public:
 
 	const EnumValPtr& GetEnumVal(bro_int_t i);
 
-	[[deprecated("Remove in v4.1. Use GetEnumVal() instead.")]]
-	EnumVal* GetVal(bro_int_t i);
-
 protected:
 	void AddNameInternal(const std::string& module_name,
 			const char* name, bro_int_t val, bool is_export);
@@ -952,12 +867,6 @@ inline const TypePtr& error_type()       { return base_type(TYPE_ERROR); }
 
 } // namespace zeek
 
-// Returns the basic (non-parameterized) type with the given type.
-// The reference count of the type is not increased.
-[[deprecated("Remove in v4.1.  Use zeek::base_type() instead")]]
-inline zeek::Type* base_type_no_ref(zeek::TypeTag tag)
-	{ return zeek::base_type(tag).get(); }
-
 extern zeek::OpaqueTypePtr md5_type;
 extern zeek::OpaqueTypePtr sha1_type;
 extern zeek::OpaqueTypePtr sha256_type;
@@ -968,128 +877,3 @@ extern zeek::OpaqueTypePtr bloomfilter_type;
 extern zeek::OpaqueTypePtr x509_opaque_type;
 extern zeek::OpaqueTypePtr ocsp_resp_opaque_type;
 extern zeek::OpaqueTypePtr paraglob_type;
-
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
-using TypeList [[deprecated("Remove in v4.1. Use zeek::TypeList instead.")]] = zeek::TypeList;
-using IndexType [[deprecated("Remove in v4.1. Use zeek::IndexType instead.")]] = zeek::IndexType;
-using TableType [[deprecated("Remove in v4.1. Use zeek::TableType instead.")]] = zeek::TableType;
-using SetType [[deprecated("Remove in v4.1. Use zeek::SetType instead.")]] = zeek::SetType;
-using FuncType [[deprecated("Remove in v4.1. Use zeek::FuncType instead.")]] = zeek::FuncType;
-using TypeType [[deprecated("Remove in v4.1. Use zeek::TypeType instead.")]] = zeek::TypeType;
-using TypeDecl [[deprecated("Remove in v4.1. Use zeek::TypeDecl instead.")]] = zeek::TypeDecl;
-using RecordType [[deprecated("Remove in v4.1. Use zeek::RecordType instead.")]] = zeek::RecordType;
-using SubNetType [[deprecated("Remove in v4.1. Use zeek::SubNetType instead.")]] = zeek::SubNetType;
-using FileType [[deprecated("Remove in v4.1. Use zeek::FileType instead.")]] = zeek::FileType;
-using OpaqueType [[deprecated("Remove in v4.1. Use zeek::OpaqueType instead.")]] = zeek::OpaqueType;
-using EnumType [[deprecated("Remove in v4.1. Use zeek::EnumType instead.")]] = zeek::EnumType;
-using VectorType [[deprecated("Remove in v4.1. Use zeek::VectorType instead.")]] = zeek::VectorType;
-using type_decl_list [[deprecated("Remove in v4.1. Use zeek::type_decl_list instead.")]] = zeek::type_decl_list;
-
-constexpr auto IsIntegral [[deprecated("Remove in v4.1. Use zeek::IsIntegral instead.")]] = zeek::IsIntegral;
-constexpr auto IsArithmetic [[deprecated("Remove in v4.1. Use zeek::IsArithmetic instead.")]] = zeek::IsArithmetic;
-constexpr auto IsBool [[deprecated("Remove in v4.1. Use zeek::IsBool instead.")]] = zeek::IsBool;
-constexpr auto IsInterval [[deprecated("Remove in v4.1. Use zeek::IsInterval instead.")]] = zeek::IsInterval;
-constexpr auto IsRecord [[deprecated("Remove in v4.1. Use zeek::IsRecord instead.")]] = zeek::IsRecord;
-constexpr auto IsFunc [[deprecated("Remove in v4.1. Use zeek::IsFunc instead.")]] = zeek::IsFunc;
-constexpr auto IsVector [[deprecated("Remove in v4.1. Use zeek::IsVector instead.")]] = zeek::IsVector;
-constexpr auto IsString [[deprecated("Remove in v4.1. Use zeek::IsString instead.")]] = zeek::IsString;
-constexpr auto IsErrorType [[deprecated("Remove in v4.1. Use zeek::IsErrorType instead.")]] = zeek::IsErrorType;
-constexpr auto BothIntegral [[deprecated("Remove in v4.1. Use zeek::BothIntegral instead.")]] = zeek::BothIntegral;
-constexpr auto BothArithmetic [[deprecated("Remove in v4.1. Use zeek::BothArithmetic instead.")]] = zeek::BothArithmetic;
-constexpr auto EitherArithmetic [[deprecated("Remove in v4.1. Use zeek::EitherArithmetic instead.")]] = zeek::EitherArithmetic;
-constexpr auto BothBool [[deprecated("Remove in v4.1. Use zeek::BothBool instead.")]] = zeek::BothBool;
-constexpr auto BothInterval [[deprecated("Remove in v4.1. Use zeek::BothInterval instead.")]] = zeek::BothInterval;
-constexpr auto BothString [[deprecated("Remove in v4.1. Use zeek::BothString instead.")]] = zeek::BothString;
-constexpr auto EitherError [[deprecated("Remove in v4.1. Use zeek::EitherError instead.")]] = zeek::EitherError;
-constexpr auto base_type [[deprecated("Remove in v4.1. Use zeek::base_type instead.")]] = zeek::base_type;
-constexpr auto error_type [[deprecated("Remove in v4.1. Use zeek::error_type instead.")]] = zeek::error_type;
-constexpr auto type_name [[deprecated("Remove in v4.1. Use zeek::type_name instead.")]] = zeek::type_name;
-constexpr auto is_network_order [[deprecated("Remove in v4.1. Use zeek::is_network_order instead.")]] = zeek::is_network_order;
-
-using TypeTag [[deprecated("Remove in v4.1. Use zeek::TypeTag instead.")]] = zeek::TypeTag;
-
-[[deprecated("Remove in v4.1. Use zeek::TYPE_VOID instead.")]]
-constexpr auto TYPE_VOID = zeek::TYPE_VOID;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_BOOL instead.")]]
-constexpr auto TYPE_BOOL = zeek::TYPE_BOOL;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INT instead.")]]
-constexpr auto TYPE_INT = zeek::TYPE_INT;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_COUNT instead.")]]
-constexpr auto TYPE_COUNT = zeek::TYPE_COUNT;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-[[deprecated("Remove in v4.1. TYPE_COUNTER was removed. Use zeek::TYPE_COUNT instead.")]]
-constexpr auto TYPE_COUNTER = zeek::TYPE_COUNTER;
-#pragma GCC diagnostic pop
-[[deprecated("Remove in v4.1. Use zeek::TYPE_DOUBLE instead.")]]
-constexpr auto TYPE_DOUBLE = zeek::TYPE_DOUBLE;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_TIME instead.")]]
-constexpr auto TYPE_TIME = zeek::TYPE_TIME;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERVAL instead.")]]
-constexpr auto TYPE_INTERVAL = zeek::TYPE_INTERVAL;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_STRING instead.")]]
-constexpr auto TYPE_STRING = zeek::TYPE_STRING;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_PATTERN instead.")]]
-constexpr auto TYPE_PATTERN = zeek::TYPE_PATTERN;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_ENUM instead.")]]
-constexpr auto TYPE_ENUM = zeek::TYPE_ENUM;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_TIMER instead.")]]
-constexpr auto TYPE_TIMER = zeek::TYPE_TIMER;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_PORT instead.")]]
-constexpr auto TYPE_PORT = zeek::TYPE_PORT;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_ADDR instead.")]]
-constexpr auto TYPE_ADDR = zeek::TYPE_ADDR;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_SUBNET instead.")]]
-constexpr auto TYPE_SUBNET = zeek::TYPE_SUBNET;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_ANY instead.")]]
-constexpr auto TYPE_ANY = zeek::TYPE_ANY;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_TABLE instead.")]]
-constexpr auto TYPE_TABLE = zeek::TYPE_TABLE;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_UNION instead.")]]
-constexpr auto TYPE_UNION = zeek::TYPE_UNION;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_RECORD instead.")]]
-constexpr auto TYPE_RECORD = zeek::TYPE_RECORD;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_LIST instead.")]]
-constexpr auto TYPE_LIST = zeek::TYPE_LIST;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_FUNC instead.")]]
-constexpr auto TYPE_FUNC = zeek::TYPE_FUNC;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_FILE instead.")]]
-constexpr auto TYPE_FILE = zeek::TYPE_FILE;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_VECTOR instead.")]]
-constexpr auto TYPE_VECTOR = zeek::TYPE_VECTOR;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_OPAQUE instead.")]]
-constexpr auto TYPE_OPAQUE = zeek::TYPE_OPAQUE;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_TYPE instead.")]]
-constexpr auto TYPE_TYPE = zeek::TYPE_TYPE;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_TYPE instead.")]]
-constexpr auto TYPE_ERROR = zeek::TYPE_ERROR;
-
-using function_flavor [[deprecated("Remove in v4.1. Use zeek::FunctionFlavor instead.")]] = zeek::FunctionFlavor;
-
-[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_FUNCTION instead.")]]
-constexpr auto FUNC_FLAVOR_FUNCTION = zeek::FUNC_FLAVOR_FUNCTION;
-[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_EVENT instead.")]]
-constexpr auto FUNC_FLAVOR_EVENT = zeek::FUNC_FLAVOR_EVENT;
-[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_HOOK instead.")]]
-constexpr auto FUNC_FLAVOR_HOOK = zeek::FUNC_FLAVOR_HOOK;
-
-using InternalTypeTag [[deprecated("Remove in v4.1. Use zeek::InteralTypeTag instead.")]] = zeek::InternalTypeTag;
-
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_VOID instead.")]]
-constexpr auto TYPE_INTERNAL_VOID = zeek::TYPE_INTERNAL_VOID;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_INT instead.")]]
-constexpr auto TYPE_INTERNAL_INT = zeek::TYPE_INTERNAL_INT;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_UNSIGNED instead.")]]
-constexpr auto TYPE_INTERNAL_UNSIGNED = zeek::TYPE_INTERNAL_UNSIGNED;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_DOUBLE instead.")]]
-constexpr auto TYPE_INTERNAL_DOUBLE = zeek::TYPE_INTERNAL_DOUBLE;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_STRING instead.")]]
-constexpr auto TYPE_INTERNAL_STRING = zeek::TYPE_INTERNAL_STRING;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_ADDR instead.")]]
-constexpr auto TYPE_INTERNAL_ADDR = zeek::TYPE_INTERNAL_ADDR;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_SUBNET instead.")]]
-constexpr auto TYPE_INTERNAL_SUBNET = zeek::TYPE_INTERNAL_SUBNET;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_OTHER instead.")]]
-constexpr auto TYPE_INTERNAL_OTHER = zeek::TYPE_INTERNAL_OTHER;
-[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_ERROR instead.")]]
-constexpr auto TYPE_INTERNAL_ERROR = zeek::TYPE_INTERNAL_ERROR;

src/UID.h

@@ -98,7 +98,3 @@ inline UID& UID::operator=(const UID& other)
 	}
 
 } // namespace zeek
-
-namespace Bro {
-	using UID [[deprecated("Remove in v4.1. Use zeek::UID.")]] = zeek::UID;
-}

src/Val.cc

@@ -1269,11 +1269,6 @@ void ListVal::Append(ValPtr v)
 	type->AsTypeList()->Append(vt);
 	}
 
-void ListVal::Append(Val* v)
-	{
-	Append({AdoptRef{}, v});
-	}
-
 TableValPtr ListVal::ToSetVal() const
 	{
 	if ( tag == TYPE_ANY )
@@ -1291,11 +1286,6 @@ TableValPtr ListVal::ToSetVal() const
 	return t;
 	}
 
-TableVal* ListVal::ConvertToSet() const
-	{
-	return ToSetVal().release();
-	}
-
 void ListVal::Describe(ODesc* d) const
 	{
 	if ( d->IsBinary() || d->IsPortable() )
@@ -1568,11 +1558,6 @@ bool TableVal::Assign(ValPtr index, ValPtr new_val, bool broker_forward,
 	return Assign(std::move(index), std::move(k), std::move(new_val), broker_forward, iterators_invalidated);
 	}
 
-bool TableVal::Assign(Val* index, Val* new_val)
-	{
-	return Assign({NewRef{}, index}, {AdoptRef{}, new_val});
-	}
-
 bool TableVal::Assign(ValPtr index, std::unique_ptr<detail::HashKey> k,
                       ValPtr new_val, bool broker_forward, bool* iterators_invalidated)
 	{
@@ -1627,11 +1612,6 @@ bool TableVal::Assign(ValPtr index, std::unique_ptr<detail::HashKey> k,
 	return true;
 	}
 
-bool TableVal::Assign(Val* index, detail::HashKey* k, Val* new_val)
-	{
-	return Assign({NewRef{}, index}, std::unique_ptr<detail::HashKey>{k}, {AdoptRef{}, new_val});
-	}
-
 ValPtr TableVal::SizeVal() const
 	{
 	return val_mgr->Count(Size());
@@ -1985,22 +1965,6 @@ bool TableVal::Contains(const IPAddr& addr) const
 	return (subnets->Lookup(addr, true) != 0);
 	}
 
-Val* TableVal::Lookup(Val* index, bool use_default_val)
-	{
-	static ValPtr last_default;
-	last_default = nullptr;
-	ValPtr idx{NewRef{}, index};
-
-	if ( const auto& rval = Find(idx) )
-		return rval.get();
-
-	if ( ! use_default_val )
-		return nullptr;
-
-	last_default = Default(idx);
-	return last_default.get();
-	}
-
 VectorValPtr TableVal::LookupSubnets(const SubNetVal* search)
 	{
 	if ( ! subnets )
@@ -2333,11 +2297,6 @@ ListValPtr TableVal::ToListVal(TypeTag t) const
 	return l;
 	}
 
-ListVal* TableVal::ConvertToList(TypeTag t) const
-	{
-	return ToListVal().release();
-	}
-
 ListValPtr TableVal::ToPureListVal() const
 	{
 	const auto& tl = table_type->GetIndices()->GetTypes();
@@ -2350,11 +2309,6 @@ ListValPtr TableVal::ToPureListVal() const
 	return ToListVal(tl[0]->Tag());
 	}
 
-ListVal* TableVal::ConvertToPureList() const
-	{
-	return ToPureListVal().release();
-	}
-
 const detail::AttrPtr& TableVal::GetAttr(detail::AttrTag t) const
 	{
 	return attrs ? attrs->Find(t) : detail::Attr::nil;
@@ -2770,9 +2724,6 @@ unsigned int TableVal::MemoryAllocation() const
 		+ table_hash->MemoryAllocation();
 	}
 
-detail::HashKey* TableVal::ComputeHash(const Val* index) const
-	{ return MakeHashKey(*index).release(); }
-
 std::unique_ptr<detail::HashKey> TableVal::MakeHashKey(const Val& index) const
 	{
 	return table_hash->MakeHashKey(index, true);
@@ -2834,10 +2785,6 @@ TableVal::TableRecordDependencies TableVal::parse_time_table_record_dependencies
 
 RecordVal::RecordTypeValMap RecordVal::parse_time_records;
 
-RecordVal::RecordVal(RecordType* t, bool init_fields)
-	: RecordVal({NewRef{}, t}, init_fields)
-	{}
-
 RecordVal::RecordVal(RecordTypePtr t, bool init_fields) : Val(std::move(t))
 	{
 	origin = nullptr;
@@ -2921,11 +2868,6 @@ void RecordVal::Assign(int field, ValPtr new_val)
 	Modified();
 	}
 
-void RecordVal::Assign(int field, Val* new_val)
-	{
-	Assign(field, {AdoptRef{}, new_val});
-	}
-
 ValPtr RecordVal::GetFieldOrDefault(int field) const
 	{
 	const auto& val = (*record_val)[field];
@@ -3195,9 +3137,6 @@ ValPtr TypeVal::DoClone(CloneState* state)
 	return {NewRef{}, this};
 	}
 
-VectorVal::VectorVal(VectorType* t) : VectorVal({NewRef{}, t})
-	{ }
-
 VectorVal::VectorVal(VectorTypePtr t) : Val(std::move(t))
 	{
 	vector_val = new vector<ValPtr>();
@@ -3682,11 +3621,6 @@ ValManager::ValManager()
 		}
 	}
 
-StringVal* ValManager::GetEmptyString() const
-	{
-	return empty_string->Ref()->AsStringVal();
-	}
-
 const PortValPtr& ValManager::Port(uint32_t port_num, TransportProto port_type) const
 	{
 	if ( port_num >= 65536 )
@@ -3698,11 +3632,6 @@ const PortValPtr& ValManager::Port(uint32_t port_num, TransportProto port_type)
 	return ports[port_type][port_num];
 	}
 
-PortVal* ValManager::GetPort(uint32_t port_num, TransportProto port_type) const
-	{
-	return Port(port_num, port_type)->Ref()->AsPortVal();
-	}
-
 const PortValPtr& ValManager::Port(uint32_t port_num) const
 	{
 	auto mask = port_num & PORT_SPACE_MASK;
@@ -3718,9 +3647,4 @@ const PortValPtr& ValManager::Port(uint32_t port_num) const
 		return Port(port_num, TRANSPORT_UNKNOWN);
 	}
 
-PortVal* ValManager::GetPort(uint32_t port_num) const
-	{
-	return Port(port_num)->Ref()->AsPortVal();
-	}
-
 }

src/Val.h

@@ -29,7 +29,6 @@
 namespace zeek {
 class String;
 }
-using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek);
@@ -39,11 +38,8 @@ namespace zeek {
 class File;
 using FilePtr = zeek::IntrusivePtr<File>;
 }
-using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
-using BroFilePtr [[deprecated("Remove in v4.1. Use zeek::FilePtr.")]] = zeek::FilePtr;
 
 namespace zeek::detail { class ScriptFunc; }
-using BroFunc [[deprecated("Remove in v4.1. Use zeek::detail::ScriptFunc instead.")]] = zeek::detail::ScriptFunc;
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(PrefixTable, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(RE_Matcher, zeek);
@@ -123,11 +119,6 @@ public:
 	// Remove this value from the given value (if appropriate).
 	virtual bool RemoveFrom(Val* v) const;
 
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	zeek::Type* Type()			{ return type.get(); }
-	[[deprecated("Remove in v4.1.  Use GetType().")]]
-	const zeek::Type* Type() const	{ return type.get(); }
-
 	const TypePtr& GetType() const
 		{ return type; }
 
@@ -272,68 +263,32 @@ public:
 
 	ValManager();
 
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->True() instead.")]]
-	inline Val* GetTrue() const
-		{ return b_true->Ref(); }
-
 	inline const ValPtr& True() const
 		{ return b_true; }
 
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->False() instead.")]]
-	inline Val* GetFalse() const
-		{ return b_false->Ref(); }
-
 	inline const ValPtr& False() const
 		{ return b_false; }
 
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->Bool() instead.")]]
-	inline Val* GetBool(bool b) const
-		{ return b ? b_true->Ref() : b_false->Ref(); }
-
 	inline const ValPtr& Bool(bool b) const
 		{ return b ? b_true : b_false; }
 
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->Int() instead.")]]
-	inline Val* GetInt(int64_t i) const
-		{
-		return i < PREALLOCATED_INT_LOWEST || i > PREALLOCATED_INT_HIGHEST ?
-		    Val::MakeInt(i).release() : ints[i - PREALLOCATED_INT_LOWEST]->Ref();
-		}
-
 	inline ValPtr Int(int64_t i) const
 		{
 		return i < PREALLOCATED_INT_LOWEST || i > PREALLOCATED_INT_HIGHEST ?
 		    Val::MakeInt(i) : ints[i - PREALLOCATED_INT_LOWEST];
 		}
 
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->Count() instead.")]]
-	inline Val* GetCount(uint64_t i) const
-		{
-		return i >= PREALLOCATED_COUNTS ? Val::MakeCount(i).release() : counts[i]->Ref();
-		}
-
 	inline ValPtr Count(uint64_t i) const
 		{
 		return i >= PREALLOCATED_COUNTS ? Val::MakeCount(i) : counts[i];
 		}
 
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->EmptyString() instead.")]]
-	StringVal* GetEmptyString() const;
-
 	inline const StringValPtr& EmptyString() const
 		{ return empty_string; }
 
-	// Port number given in host order.
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->Port() instead.")]]
-	PortVal* GetPort(uint32_t port_num, TransportProto port_type) const;
-
 	// Port number given in host order.
 	const PortValPtr& Port(uint32_t port_num, TransportProto port_type) const;
 
-	// Host-order port number already masked with port space protocol mask.
-	[[deprecated("Remove in v4.1.  Use zeek::val_mgr->Port() instead.")]]
-	PortVal* GetPort(uint32_t port_num) const;
-
 	// Host-order port number already masked with port space protocol mask.
 	const PortValPtr& Port(uint32_t port_num) const;
 
@@ -583,10 +538,6 @@ public:
 	StringValPtr Replace(RE_Matcher* re, const String& repl,
 	                                      bool do_all);
 
-	[[deprecated("Remove in v4.1.  Use Replace().")]]
-	Val* Substitute(RE_Matcher* re, StringVal* repl, bool do_all)
-		{ return Replace(re, *repl->AsString(), do_all).release(); }
-
 protected:
 	void ValDescribe(ODesc* d) const override;
 	ValPtr DoClone(CloneState* state) override;
@@ -669,11 +620,6 @@ public:
 
 	const ValPtr& Idx(size_t i) const	{ return vals[i]; }
 
-	[[deprecated("Remove in v4.1.  Use Idx() instead")]]
-	Val* Index(const int n)		{ return vals[n].get(); }
-	[[deprecated("Remove in v4.1.  Use Idx() instead")]]
-	const Val* Index(const int n) const	{ return vals[n].get(); }
-
 	// Returns an RE_Matcher() that will match any string that
 	// includes embedded within it one of the patterns listed
 	// (as a string, e.g., "foo|bar") in this ListVal.
@@ -690,15 +636,9 @@ public:
 	 */
 	void Append(ValPtr v);
 
-	[[deprecated("Remove in v4.1.  Use Append(IntrusivePtr) instead.")]]
-	void Append(Val* v);
-
 	// Returns a Set representation of the list (which must be homogeneous).
 	TableValPtr ToSetVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToSetVal() instead.")]]
-	TableVal* ConvertToSet() const;
-
 	const std::vector<ValPtr>& Vals() const	{ return vals; }
 
 	void Describe(ODesc* d) const override;
@@ -723,9 +663,6 @@ public:
 
 	TableEntryVal* Clone(Val::CloneState* state);
 
-	[[deprecated("Remove in v4.1.  Use GetVal().")]]
-	Val* Value()	{ return val.get(); }
-
 	const ValPtr& GetVal() const
 		{ return val; }
 
@@ -763,11 +700,6 @@ class TableVal final : public Val, public notifier::detail::Modifiable {
 public:
 	explicit TableVal(TableTypePtr t, detail::AttributesPtr attrs = nullptr);
 
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtrs instead.")]]
-	explicit TableVal(TableType* t, detail::Attributes* attrs = nullptr)
-		: TableVal({NewRef{}, t}, {NewRef{}, attrs})
-		{}
-
 	~TableVal() override;
 
 	/**
@@ -803,17 +735,6 @@ public:
 	            ValPtr new_val, bool broker_forward = true,
 	            bool* iterators_invalidated = nullptr);
 
-	// Returns true if the assignment typechecked, false if not. The
-	// methods take ownership of new_val, but not of the index.  If we're
-	// a set, new_val has to be nil.
-	[[deprecated("Remove in v4.1.  Use IntrusivePtr overload instead.")]]
-	bool Assign(Val* index, Val* new_val);
-
-	// Same as other Assign() method, but takes a precomuted detail::HashKey and
-	// deletes it when done.
-	[[deprecated("Remove in v4.1.  Use IntrusivePtr overload instead.")]]
-	bool Assign(Val* index, detail::HashKey* k, Val* new_val);
-
 	ValPtr SizeVal() const override;
 
 	// Add the entire contents of the table to the given value,
@@ -844,28 +765,16 @@ public:
 	 */
 	TableValPtr Intersection(const TableVal& v) const;
 
-	[[deprecated("Remove in v4.1.  Use Intersection() instead.")]]
-	TableVal* Intersect(const TableVal* v) const
-		{ return Intersection(*v).release(); }
-
 	// Returns true if this set contains the same members as the
 	// given set.  Note that comparisons are done using hash keys,
 	// so errors can arise for compound sets such as sets-of-sets.
 	// See https://bro-tracker.atlassian.net/browse/BIT-1949.
 	bool EqualTo(const TableVal& v) const;
 
-	[[deprecated("Remove in v4.1.  Pass TableVal& instead.")]]
-	bool EqualTo(const TableVal* v) const
-		{ return EqualTo(*v); }
-
 	// Returns true if this set is a subset (not necessarily proper)
 	// of the given set.
 	bool IsSubsetOf(const TableVal& v) const;
 
-	[[deprecated("Remove in v4.1.  Pass TableVal& instead.")]]
-	bool IsSubsetOf(const TableVal* v) const
-		{ return IsSubsetOf(*v); }
-
 	// Expands any lists in the index into multiple initializations.
 	// Returns true if the initializations typecheck, false if not.
 	bool ExpandAndInit(ValPtr index, ValPtr new_val);
@@ -891,12 +800,6 @@ public:
 	 */
 	ValPtr FindOrDefault(const ValPtr& index);
 
-	// Returns the element's value if it exists in the table,
-	// nil otherwise.  Note, "index" is not const because we
-	// need to Ref/Unref it when calling the default function.
-	[[deprecated("Remove in v4.1.  Use Find() or FindOrDefault().")]]
-	Val* Lookup(Val* index, bool use_default_val = true);
-
 	/**
 	 * Returns true if this is a table[subnet]/set[subnet] and the
 	 * given address was found in the table. Otherwise returns false.
@@ -926,10 +829,6 @@ public:
 	 */
 	ListValPtr RecreateIndex(const detail::HashKey& k) const;
 
-	[[deprecated("Remove in v4.1.  Use RecreateIndex().")]]
-	ListVal* RecoverIndex(const detail::HashKey* k) const
-		{ return RecreateIndex(*k).release(); }
-
 	/**
 	 * Remove an element from the table and return it.
 	 * @param index  The index to remove.
@@ -953,14 +852,6 @@ public:
 	 */
 	ValPtr Remove(const detail::HashKey& k, bool* iterators_invalidated = nullptr);
 
-	[[deprecated("Remove in v4.1.  Use Remove().")]]
-	Val* Delete(const Val* index)
-		{ return Remove(*index).release(); }
-
-	[[deprecated("Remove in v4.1.  Use Remove().")]]
-	Val* Delete(const detail::HashKey* k)
-		{ return Remove(*k).release(); }
-
 	// Returns a ListVal representation of the table (which must be a set).
 	ListValPtr ToListVal(TypeTag t = TYPE_ANY) const;
 
@@ -968,18 +859,10 @@ public:
 	// with non-composite index type).
 	ListValPtr ToPureListVal() const;
 
-	[[deprecated("Remove in v4.1.  Use ToListVal() instead.")]]
-	ListVal* ConvertToList(TypeTag t=TYPE_ANY) const;
-	[[deprecated("Remove in v4.1.  Use ToPureListVal() instead.")]]
-	ListVal* ConvertToPureList() const;	// must be single index type
-
 	void SetAttrs(detail::AttributesPtr attrs);
 
 	const detail::AttrPtr& GetAttr(detail::AttrTag t) const;
 
-	[[deprecated("Remove in v4.1.  Use GetAttrs().")]]
-	detail::Attributes* Attrs()	{ return attrs.get(); }
-
 	const detail::AttributesPtr& GetAttrs() const
 		{ return attrs; }
 
@@ -1019,9 +902,6 @@ public:
 	 */
 	std::unique_ptr<detail::HashKey> MakeHashKey(const Val& index) const;
 
-	[[deprecated("Remove in v4.1.  Use MakeHashKey().")]]
-	detail::HashKey* ComputeHash(const Val* index) const;
-
 	notifier::detail::Modifiable* Modifiable() override	{ return this; }
 
 	// Retrieves and saves all table state (key-value pairs) for
@@ -1117,8 +997,6 @@ private:
 
 class RecordVal final : public Val, public notifier::detail::Modifiable {
 public:
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtr instead.")]]
-	explicit RecordVal(RecordType* t, bool init_fields = true);
 	explicit RecordVal(RecordTypePtr t, bool init_fields = true);
 
 	~RecordVal() override;
@@ -1143,16 +1021,6 @@ public:
 	void Assign(int field, Ts&&... args)
 		{ Assign(field, make_intrusive<T>(std::forward<Ts>(args)...)); }
 
-	[[deprecated("Remove in v4.1.  Assign an IntrusivePtr instead.")]]
-	void Assign(int field, Val* new_val);
-	// Note: the following nullptr method can also go upon removing the above.
-	void Assign(int field, std::nullptr_t)
-		{ Assign(field, ValPtr{}); }
-
-	[[deprecated("Remove in v4.1.  Use GetField().")]]
-	Val* Lookup(int field) const    // Does not Ref() value.
-		{ return (*record_val)[field].get(); }
-
 	/**
 	 * Appends a value to the record's fields.  The caller is responsible
 	 * for ensuring that fields are appended in the correct orer and
@@ -1204,10 +1072,6 @@ public:
 	 */
 	ValPtr GetFieldOrDefault(int field) const;
 
-	[[deprecated("Remove in v4.1.  Use GetFieldOrDefault().")]]
-	Val* LookupWithDefault(int field) const
-		{ return GetFieldOrDefault(field).release(); }
-
 	/**
 	 * Returns the value of a given field name.
 	 * @param field  The name of a field to retrieve.
@@ -1268,18 +1132,6 @@ public:
 		return field_val_ptr->Get();
 		}
 
-	/**
-	 * Looks up the value of a field by field name.  If the field doesn't
-	 * exist in the record type, it's an internal error: abort.
-	 * @param field name of field to lookup.
-	 * @param with_default whether to rely on field's &default attribute when
-	 * the field has yet to be initialized.
-	 * @return the value in field \a field.
-	 */
-	[[deprecated("Remove in v4.1.  Use GetField() or GetFieldOrDefault().")]]
-	Val* Lookup(const char* field, bool with_default = false) const
-		{ return with_default ? GetFieldOrDefault(field).release() : GetField(field).get(); }
-
 	void Describe(ODesc* d) const override;
 
 	/**
@@ -1372,8 +1224,6 @@ protected:
 
 class VectorVal final : public Val, public notifier::detail::Modifiable {
 public:
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtr instead.")]]
-	explicit VectorVal(VectorType* t);
 	explicit VectorVal(VectorTypePtr t);
 	~VectorVal() override;
 
@@ -1388,22 +1238,10 @@ public:
 	 */
 	bool Assign(unsigned int index, ValPtr element);
 
-	// Note: does NOT Ref() the element! Remember to do so unless
-	//       the element was just created and thus has refcount 1.
-	[[deprecated("Remove in v4.1.  Assign an IntrusivePtr instead.")]]
-	bool Assign(unsigned int index, Val* element)
-		{ return Assign(index, {AdoptRef{}, element}); }
 	// Note: the following nullptr method can also go upon removing the above.
 	void Assign(unsigned int index, std::nullptr_t)
 		{ Assign(index, ValPtr{}); }
 
-	[[deprecated("Remove in v4.1.  Assign using integer index and IntrusivePtr element.")]]
-	bool Assign(Val* index, Val* element)
-		{
-		return Assign(index->AsListVal()->Idx(0)->CoerceToUnsigned(),
-		              {AdoptRef{}, element});
-		}
-
 	/**
 	 * Assigns a given value to multiple indices in the vector.
 	 * @param index  The starting index to assign to.
@@ -1414,10 +1252,6 @@ public:
 	bool AssignRepeat(unsigned int index, unsigned int how_many,
 	                  ValPtr element);
 
-	[[deprecated("Remove in v4.1.  Assign an IntrusivePtr instead.")]]
-	bool AssignRepeat(unsigned int index, unsigned int how_many, Val* element)
-		{ return AssignRepeat(index, how_many, {NewRef{}, element}); }
-
 	// Add this value to the given value (if appropriate).
 	// Returns true if succcessful.
 	bool AddTo(Val* v, bool is_first_init) const override;
@@ -1440,17 +1274,6 @@ public:
 	bro_uint_t CountAt(unsigned int index) const
 		{ return At(index)->AsCount(); }
 
-	[[deprecated("Remove in v4.1.  Use At().")]]
-	Val* Lookup(unsigned int index) const
-		{ return At(index).get(); }
-
-	[[deprecated("Remove in v4.1.  Use At().")]]
-	Val* Lookup(Val* index)
-		{
-		bro_uint_t i = index->AsListVal()->Idx(0)->CoerceToUnsigned();
-		return At(static_cast<unsigned int>(i)).get();
-		}
-
 	unsigned int Size() const { return vector_val->size(); }
 
 	// Is there any way to reclaim previously-allocated memory when you
@@ -1475,10 +1298,6 @@ public:
 	 */
 	bool Insert(unsigned int index, ValPtr element);
 
-	[[deprecated("Remove in v4.1.  Insert an IntrusivePtr instead.")]]
-	bool Insert(unsigned int index, Val* element)
-		{ return Insert(index, {AdoptRef{}, element}); }
-
 	/**
 	 * Inserts an element at the end of the vector.
 	 * @param element  The value to insert into the vector.
@@ -1564,24 +1383,3 @@ extern bool can_cast_value_to_type(const Val* v, Type* t);
 extern bool can_cast_value_to_type(const Type* s, Type* t);
 
 } // namespace zeek
-
-using Val [[deprecated("Remove in v4.1. Use zeek::Val instead.")]] = zeek::Val;
-using PortVal [[deprecated("Remove in v4.1. Use zeek::PortVal instead.")]] = zeek::PortVal;
-using AddrVal [[deprecated("Remove in v4.1. Use zeek::AddrVal instead.")]] = zeek::AddrVal;
-using SubNetVal [[deprecated("Remove in v4.1. Use zeek::SubNetVal instead.")]] = zeek::SubNetVal;
-using PatternVal [[deprecated("Remove in v4.1. Use zeek::PatternVal instead.")]] = zeek::PatternVal;
-using TableVal [[deprecated("Remove in v4.1. Use zeek::TableVal instead.")]] = zeek::TableVal;
-using TableValTimer [[deprecated("Remove in v4.1. Use zeek::TableVal instead.")]] = zeek::TableValTimer;
-using RecordVal [[deprecated("Remove in v4.1. Use zeek::RecordVal instead.")]] = zeek::RecordVal;
-using ListVal [[deprecated("Remove in v4.1. Use zeek::ListVal instead.")]] = zeek::ListVal;
-using StringVal [[deprecated("Remove in v4.1. Use zeek::StringVal instead.")]] = zeek::StringVal;
-using EnumVal [[deprecated("Remove in v4.1. Use zeek::EnumVal instead.")]] = zeek::EnumVal;
-using VectorVal [[deprecated("Remove in v4.1. Use zeek::VectorVal instead.")]] = zeek::VectorVal;
-using TableEntryVal [[deprecated("Remove in v4.1. Use zeek::TableEntryVal instead.")]] = zeek::TableEntryVal;
-using TimeVal [[deprecated("Remove in v4.1. Use zeek::TimeVal instead.")]] = zeek::TimeVal;
-using DoubleVal [[deprecated("Remove in v4.1. Use zeek::DoubleVal instead.")]] = zeek::DoubleVal;
-using IntervalVal [[deprecated("Remove in v4.1. Use zeek::IntervalVal instead.")]] = zeek::IntervalVal;
-using ValManager [[deprecated("Remove in v4.1. Use zeek::ValManager instead.")]] = zeek::ValManager;
-
-// Alias for zeek::val_mgr.
-extern zeek::ValManager*& val_mgr [[deprecated("Remove in v4.1. Use zeek::val_mgr instead.")]];

src/Var.cc

@@ -780,106 +780,3 @@ IDPList gather_outer_ids(Scope* scope, Stmt* body)
 	}
 
 } // namespace zeek::detail
-
-zeek::Val* internal_val(const char* name)
-	{
-	return zeek::id::find_val(name).get();
-	}
-
-zeek::Val* internal_const_val(const char* name)
-	{
-	return zeek::id::find_const(name).get();
-	}
-
-zeek::Val* opt_internal_val(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	return id ? id->GetVal().get() : nullptr;
-	}
-
-double opt_internal_double(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	if ( ! id ) return 0.0;
-	const auto& v = id->GetVal();
-	return v ? v->InternalDouble() : 0.0;
-	}
-
-bro_int_t opt_internal_int(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	if ( ! id ) return 0;
-	const auto& v = id->GetVal();
-	return v ? v->InternalInt() : 0;
-	}
-
-bro_uint_t opt_internal_unsigned(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	if ( ! id ) return 0;
-	const auto& v = id->GetVal();
-	return v ? v->InternalUnsigned() : 0;
-	}
-
-zeek::StringVal* opt_internal_string(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	if ( ! id ) return nullptr;
-	const auto& v = id->GetVal();
-	return v ? v->AsStringVal() : nullptr;
-	}
-
-zeek::TableVal* opt_internal_table(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	if ( ! id ) return nullptr;
-	const auto& v = id->GetVal();
-	return v ? v->AsTableVal() : nullptr;
-	}
-
-zeek::ListVal* internal_list_val(const char* name)
-	{
-	const auto& id = zeek::detail::lookup_ID(name, zeek::detail::GLOBAL_MODULE_NAME);
-	if ( ! id )
-		return nullptr;
-
-	zeek::Val* v = id->GetVal().get();
-
-	if ( v )
-		{
-		if ( v->GetType()->Tag() == zeek::TYPE_LIST )
-			return (zeek::ListVal*) v;
-
-		else if ( v->GetType()->IsSet() )
-			{
-			zeek::TableVal* tv = v->AsTableVal();
-			auto lv = tv->ToPureListVal();
-			return lv.release();
-			}
-
-		else
-			zeek::reporter->InternalError("internal variable %s is not a list", name);
-		}
-
-	return nullptr;
-	}
-
-zeek::Type* internal_type(const char* name)
-	{
-	return zeek::id::find_type(name).get();
-	}
-
-zeek::Func* internal_func(const char* name)
-	{
-	const auto& v = zeek::id::find_val(name);
-
-	if ( v )
-		return v->AsFunc();
-	else
-		return nullptr;
-	}
-
-zeek::EventHandlerPtr internal_handler(const char* name)
-	{
-	return event_registry->Register(name);
-	}

src/Var.h

@@ -42,53 +42,3 @@ extern void end_func(StmtPtr body);
 extern IDPList gather_outer_ids(Scope* scope, Stmt* body);
 
 } // namespace zeek::detail
-
-using decl_type [[deprecated("Remove in v4.1. Use zeek::detail::DeclType.")]] = zeek::detail::DeclType;
-constexpr auto VAR_REGULAR [[deprecated("Remove in v4.1. Use zeek::detail::VAR_REGULAR.")]] = zeek::detail::VAR_REGULAR;
-constexpr auto VAR_CONST [[deprecated("Remove in v4.1. Use zeek::detail::VAR_CONST.")]] = zeek::detail::VAR_CONST;
-constexpr auto VAR_REDEF [[deprecated("Remove in v4.1. Use zeek::detail::VAR_REDEF.")]] = zeek::detail::VAR_REDEF;
-constexpr auto VAR_OPTION [[deprecated("Remove in v4.1. Use zeek::detail::VAR_OPTION.")]] = zeek::detail::VAR_OPTION;
-
-constexpr auto add_global [[deprecated("Remove in v4.1. Use zeek::detail::add_global.")]] = zeek::detail::add_global;
-constexpr auto add_local [[deprecated("Remove in v4.1. Use zeek::detail::add_local.")]] = zeek::detail::add_local;
-constexpr auto add_and_assign_local [[deprecated("Remove in v4.1. Use zeek::detail::add_and_assign_local.")]] = zeek::detail::add_and_assign_local;
-constexpr auto add_type [[deprecated("Remove in v4.1. Use zeek::detail::add_type.")]] = zeek::detail::add_type;
-constexpr auto begin_func [[deprecated("Remove in v4.1. Use zeek::detail::begin_func.")]] = zeek::detail::begin_func;
-constexpr auto end_func [[deprecated("Remove in v4.1. Use zeek::detail::end_func.")]] = zeek::detail::end_func;
-constexpr auto gather_outer_ids [[deprecated("Remove in v4.1. Use zeek::detail::gather_outer_ids.")]] = zeek::detail::gather_outer_ids;
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find_val().")]]
-extern zeek::Val* internal_val(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find_const().")]]
-extern zeek::Val* internal_const_val(const char* name); // internal error if not const
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find() or zeek::id::find_val().")]]
-extern zeek::Val* opt_internal_val(const char* name);	// returns nil if not defined
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find() or zeek::id::find_val().")]]
-extern double opt_internal_double(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find() or zeek::id::find_val().")]]
-extern bro_int_t opt_internal_int(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find() or zeek::id::find_val().")]]
-extern bro_uint_t opt_internal_unsigned(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find() or zeek::id::find_val().")]]
-extern zeek::StringVal* opt_internal_string(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find() or zeek::id::find_val().")]]
-extern zeek::TableVal* opt_internal_table(const char* name);	// nil if not defined
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find(), zeek::id::find_val(), and/or TableVal::ToPureListVal().")]]
-extern zeek::ListVal* internal_list_val(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find_type().")]]
-extern zeek::Type* internal_type(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::id::find_func().")]]
-extern zeek::Func* internal_func(const char* name);
-
-[[deprecated("Remove in v4.1.  Use zeek::event_registry->Register().")]]
-extern zeek::EventHandlerPtr internal_handler(const char* name);

src/ZeekList.h

@@ -8,13 +8,13 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
-namespace zeek { class Type; }
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
 ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail);
 
 namespace zeek {
 
+class Type;
+
 using ValPList = PList<Val>;
 using ExprPList = PList<detail::Expr>;
 using IDPList = PList<detail::ID>;
@@ -24,11 +24,3 @@ using AttrPList = PList<detail::Attr>;
 using TimerPList = PList<detail::Timer, ListOrder::UNORDERED>;
 
 } // namespace zeek
-
-using val_list [[deprecated("Remove in v4.1. Use zeek::ValPList.")]] = zeek::ValPList;
-using expr_list [[deprecated("Remove in v4.1. Use zeek::ExprPList.")]] = zeek::ExprPList;
-using id_list [[deprecated("Remove in v4.1. Use zeek::IDPList.")]] = zeek::IDPList;
-using stmt_list [[deprecated("Remove in v4.1. Use zeek::StmtPList.")]] = zeek::StmtPList;
-using type_list [[deprecated("Remove in v4.1. Use zeek::TypePList.")]] = zeek::TypePList;
-using attr_list [[deprecated("Remove in v4.1. Use zeek::AttrPList.")]] = zeek::AttrPList;
-using timer_list [[deprecated("Remove in v4.1. Use zeek::TimerPList.")]] = zeek::TimerPList;

src/ZeekString.h

@@ -188,8 +188,3 @@ extern String* concatenate(String::CVec& v);
 extern void delete_strings(std::vector<const String*>& v);
 
 } // namespace zeek
-
-using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;
-using BroStringLenCmp [[deprecated("Remove in v4.1. Use zeek::StringLenCmp instead.")]] = zeek::StringLenCmp;
-using byte_vec [[deprecated("Remove in v4.1. Use zeek::byte_vec instead.")]] = zeek::byte_vec;
-using data_chunk_t [[deprecated("Remove in v4.1. Use zeek::data_chunk_t instead.")]] = zeek::data_chunk_t;

src/analyzer/Analyzer.cc

@@ -784,11 +784,6 @@ void Analyzer::UpdateConnVal(RecordVal *conn_val)
 		(*i)->UpdateConnVal(conn_val);
 	}
 
-RecordVal* Analyzer::BuildConnVal()
-	{
-	return conn->ConnVal()->Ref()->AsRecordVal();
-	}
-
 const RecordValPtr& Analyzer::ConnVal()
 	{
 	return conn->ConnVal();
@@ -799,38 +794,6 @@ void Analyzer::Event(EventHandlerPtr f, const char* name)
 	conn->Event(f, this, name);
 	}
 
-void Analyzer::Event(EventHandlerPtr f, Val* v1, Val* v2)
-	{
-	IntrusivePtr val1{AdoptRef{}, v1};
-	IntrusivePtr val2{AdoptRef{}, v2};
-
-	if ( f )
-		conn->EnqueueEvent(f, this, conn->ConnVal(), std::move(val1), std::move(val2));
-	}
-
-void Analyzer::ConnectionEvent(EventHandlerPtr f, ValPList* vl)
-	{
-	auto args = val_list_to_args(*vl);
-	delete vl;
-
-	if ( f )
-		conn->EnqueueEvent(f, this, std::move(args));
-	}
-
-void Analyzer::ConnectionEvent(EventHandlerPtr f, ValPList vl)
-	{
-	auto args = val_list_to_args(vl);
-
-	if ( f )
-		conn->EnqueueEvent(f, this, std::move(args));
-	}
-
-void Analyzer::ConnectionEventFast(EventHandlerPtr f, ValPList vl)
-	{
-	auto args = val_list_to_args(vl);
-	conn->EnqueueEvent(f, this, std::move(args));
-	}
-
 void Analyzer::EnqueueConnEvent(EventHandlerPtr f, Args args)
 	{
 	conn->EnqueueEvent(f, this, std::move(args));

src/analyzer/Analyzer.h

@@ -28,9 +28,6 @@ class File;
 using FilePtr = zeek::IntrusivePtr<File>;
 }
 
-using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
-using BroFilePtr [[deprecated("Remove in v4.1. Use zeek::FilePtr.")]] = zeek::FilePtr;
-
 namespace zeek::analyzer {
 
 class Analyzer;
@@ -552,13 +549,6 @@ public:
 	 */
 	virtual void UpdateConnVal(RecordVal *conn_val);
 
-	/**
-	 * Convenience function that forwards directly to
-	 * Connection::BuildConnVal().
-	 */
-	[[deprecated("Remove in v4.1.  Use ConnVal() instead.")]]
-	RecordVal* BuildConnVal();
-
 	/**
 	 * Convenience function that forwards directly to
 	 * Connection::ConnVal().
@@ -571,34 +561,6 @@ public:
 	 */
 	void Event(EventHandlerPtr f, const char* name = nullptr);
 
-	/**
-	 * Convenience function that forwards directly to the corresponding
-	 * Connection::Event().
-	 */
-	[[deprecated("Remove in v4.1.  Use EnqueueConnEvent() instead (note it doesn't automatically ad the connection argument).")]]
-	void Event(EventHandlerPtr f, Val* v1, Val* v2 = nullptr);
-
-	/**
-	 * Convenience function that forwards directly to
-	 * Connection::ConnectionEvent().
-	 */
-	[[deprecated("Remove in v4.1.  Use EnqueueConnEvent() instead.")]]
-	void ConnectionEvent(EventHandlerPtr f, ValPList* vl);
-
-	/**
-	 * Convenience function that forwards directly to
-	 * Connection::ConnectionEvent().
-	 */
-	[[deprecated("Remove in v4.1.  Use EnqueueConnEvent() instead.")]]
-	void ConnectionEvent(EventHandlerPtr f, ValPList vl);
-
-	/**
-	 * Convenience function that forwards directly to
-	 * Connection::ConnectionEventFast().
-	 */
-	[[deprecated("Remove in v4.1.  Use EnqueueConnEvent() instead.")]]
-	void ConnectionEventFast(EventHandlerPtr f, ValPList vl);
-
 	/**
 	 * Convenience function that forwards directly to
 	 * Connection::EnqueueEvent().
@@ -957,16 +919,3 @@ private:
 };
 
 } // namespace zeek::analyzer
-
-namespace analyzer {
-
-using Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::Analyzer instead.")]] = zeek::analyzer::Analyzer;
-using AnalyzerTimer [[deprecated("Remove in v4.1. Use zeek::analyzer::AnalyzerTimer instead.")]] = zeek::analyzer::AnalyzerTimer;
-using SupportAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::SupportAnalyzer instead.")]] = zeek::analyzer::SupportAnalyzer;
-using OutputHandler [[deprecated("Remove in v4.1. Use zeek::analyzer::OutputHandler instead.")]] = zeek::analyzer::OutputHandler;
-using TransportLayerAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::TransportLayerAnalyzer instead.")]] = zeek::analyzer::TransportLayerAnalyzer;
-
-using analyzer_list [[deprecated("Remove in v4.1. Use zeek::analyzer::analyzer_list instead.")]] = zeek::analyzer::analyzer_list;
-using ID [[deprecated("Remove in v4.1. Use zeek::analyzer::ID instead.")]] = zeek::analyzer::ID;
-
-} // namespace analyzer

src/analyzer/Component.h

@@ -108,7 +108,3 @@ private:
 };
 
 } // namespace zeek::analyzer
-
-namespace analyzer {
-	using Component [[deprecated("Remove in v4.1. Use zeek::analyzer::Component.")]] = zeek::analyzer::Component;
-} // namespace analyzer

src/analyzer/Manager.h

@@ -406,13 +406,7 @@ extern analyzer::Manager* analyzer_mgr;
 
 } // namespace zeek
 
-namespace analyzer {
+// Macros for analyzer debug logging which include the connection id into the
-	using Manager [[deprecated("Remove in v4.1. Use zeek::analyzer::Manager instead.")]] = zeek::analyzer::Manager;
-} // namespace analyzer
-
-extern zeek::analyzer::Manager*& analyzer_mgr [[deprecated("Remove in v4.1. Use zeek::analyzer_mgr instead.")]];
-
-// Macros for anayzer debug logging which include the connection id into the
 // message.
 #ifdef DEBUG
 # define DBG_ANALYZER(conn, txt) \

src/analyzer/Tag.cc

@@ -23,17 +23,8 @@ const EnumValPtr& Tag::AsVal() const
 	return zeek::Tag::AsVal(analyzer_mgr->GetTagType());
 	}
 
-EnumVal* Tag::AsEnumVal() const
-	{
-	return AsVal().get();
-	}
-
 Tag::Tag(EnumValPtr val)
 	: zeek::Tag(std::move(val))
 	{ }
 
-Tag::Tag(EnumVal* val)
-	: zeek::Tag({NewRef{}, val})
-	{ }
-
 } // namespace zeek::analyzer

src/analyzer/Tag.h

@@ -12,14 +12,6 @@ namespace zeek::plugin {
 	template <class T> class TaggedComponent;
 	template <class T, class C> class ComponentManager;
 }
-namespace plugin {
-	template <class T>
-	using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] =
-		zeek::plugin::TaggedComponent<T>;
-	template <class T, class C>
-	using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] =
-		zeek::plugin::ComponentManager<T, C>;
-}
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, analyzer);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, analyzer);
@@ -92,9 +84,6 @@ public:
 	 */
 	const EnumValPtr& AsVal() const;
 
-	[[deprecated("Remove in v4.1.  Use AsVal() instead.")]]
-	EnumVal* AsEnumVal() const;
-
 	static const Tag Error;
 
 protected:
@@ -120,13 +109,6 @@ protected:
 	 * @param val An enum value of script type \c Analyzer::Tag.
 	 */
 	explicit Tag(EnumValPtr val);
-
-	[[deprecated("Remove in v4.1.  Construct from IntrusivePtr instead")]]
-	explicit Tag(EnumVal* val);
 };
 
 } // namespace zeek::analyzer
-
-namespace analyzer {
-	using Tag [[deprecated("Remove in v4.1. Use zeek::analyzer::Tag")]] = zeek::analyzer::Tag;
-} // namespace analyzer