mirror of
https://github.com/zeek/zeek.git
synced 2025-10-14 04:28:20 +00:00
Merge remote-tracking branch 'origin/topic/timw/deprecation-cleanup'
Merge adjustments: - Removed some stale str_split() references from docs - Renumbered TypeTag enum comments - Simplified test-case for @unload (don't need .bro files anymore) * origin/topic/timw/deprecation-cleanup: Doc updates Fix language.init-in-anon-function btest due to changes to log filter predicates Remove deprecated log filter predicates for 4.1 Remove Plugin::HookCallFunction and fix tests related to it Remove support for .bro script extension and BRO_ environment variables Remove deprecated ICMP events Remove some deprected methods/events from bif files Remove TYPE_COUNTER Remove all of the random single-file deprecations Remove all fully-deprecated files Update bifcl submodule to remove deprecations from generated code
This commit is contained in:
commit
1ca85f0221
322 changed files with 500 additions and 5697 deletions
|
@ -214,9 +214,3 @@ private:
|
|||
};
|
||||
|
||||
} // namespace zeek::threading
|
||||
|
||||
namespace threading {
|
||||
|
||||
using BasicThread [[deprecated("Remove in v4.1. Use zeek::threading::BasicThread.")]] = zeek::threading::BasicThread;
|
||||
|
||||
} // namespace threading
|
||||
|
|
|
@ -164,9 +164,3 @@ private:
|
|||
};
|
||||
|
||||
} // namespace zeek::threading
|
||||
|
||||
namespace threading::formatter {
|
||||
|
||||
using Formatter [[deprecated("Remove in v4.1. Use zeek::threading::Formatter.")]] = zeek::threading::Formatter;
|
||||
|
||||
} // namespace threading::formatter
|
||||
|
|
|
@ -163,16 +163,3 @@ private:
|
|||
extern threading::Manager* thread_mgr;
|
||||
|
||||
} // namespace zeek
|
||||
|
||||
extern zeek::threading::Manager*& thread_mgr [[deprecated("Remove in v4.1. Use zeek::thread_mgr.")]];
|
||||
|
||||
namespace threading {
|
||||
|
||||
using Manager [[deprecated("Remove in v4.1. Use zeek::threading::Manager.")]] = zeek::threading::Manager;
|
||||
|
||||
namespace detail {
|
||||
|
||||
using HeartbeatTimer [[deprecated("Remove in v4.1. Use zeek::threading::detail::HeartbeatTimer.")]] = zeek::threading::detail::HeartbeatTimer;
|
||||
|
||||
} // namespace detail
|
||||
} // namespace threading
|
||||
|
|
|
@ -118,7 +118,7 @@ public:
|
|||
|
||||
bool Process() override
|
||||
{
|
||||
debug_logger.Log(stream, "%s: %s", Object()->Name(), msg);
|
||||
zeek::detail::debug_logger.Log(stream, "%s: %s", Object()->Name(), msg);
|
||||
return true;
|
||||
}
|
||||
private:
|
||||
|
|
|
@ -6,17 +6,10 @@
|
|||
#include "zeek/iosource/IOSource.h"
|
||||
#include "zeek/Flare.h"
|
||||
|
||||
namespace zeek::threading {
|
||||
struct Value;
|
||||
struct Field;
|
||||
}
|
||||
namespace threading {
|
||||
using Value [[deprecated("Remove in v4.1. Use zeek::threading::Value.")]] = zeek::threading::Value;
|
||||
using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field;
|
||||
}
|
||||
|
||||
namespace zeek::threading {
|
||||
|
||||
struct Value;
|
||||
struct Field;
|
||||
class BasicInputMessage;
|
||||
class BasicOutputMessage;
|
||||
|
||||
|
@ -479,14 +472,3 @@ private:
|
|||
};
|
||||
|
||||
} // namespace zeek::threading
|
||||
|
||||
namespace threading {
|
||||
|
||||
using MsgThread [[deprecated("Remove in v4.1. Use zeek::threading::MsgThread.")]] = zeek::threading::MsgThread;
|
||||
using Message [[deprecated("Remove in v4.1. Use zeek::threading::Message.")]] = zeek::threading::Message;
|
||||
using BasicInputMessage [[deprecated("Remove in v4.1. Use zeek::threading::BasicInputMessage.")]] = zeek::threading::BasicInputMessage;
|
||||
using BasicOutputMessage [[deprecated("Remove in v4.1. Use zeek::threading::BasicOutputMessage.")]] = zeek::threading::BasicOutputMessage;
|
||||
template<typename O> using InputMessage [[deprecated("Remove in v4.1. Use zeek::threading::InputMessage.")]] = zeek::threading::InputMessage<O>;
|
||||
template<typename O> using OutputMessage [[deprecated("Remove in v4.1. Use zeek::threading::OutputMessage.")]] = zeek::threading::OutputMessage<O>;
|
||||
|
||||
} // namespace threading
|
||||
|
|
|
@ -262,9 +262,3 @@ inline void Queue<T>::WakeUp()
|
|||
}
|
||||
|
||||
} // namespace zeek::threading
|
||||
|
||||
namespace threading {
|
||||
|
||||
template<typename T> using Queue [[deprecated("Remove in v4.1. Use zeek::threading::Queue.")]] = zeek::threading::Queue<T>;
|
||||
|
||||
} // namespace threading
|
||||
|
|
|
@ -215,10 +215,3 @@ private:
|
|||
};
|
||||
|
||||
} // namespace zeek::threading
|
||||
|
||||
namespace threading {
|
||||
|
||||
using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field;
|
||||
using Value [[deprecated("Remove in v4.1. Use zeek::threading::Value.")]] = zeek::threading::Value;
|
||||
|
||||
} // namespace threading
|
||||
|
|
|
@ -60,9 +60,3 @@ private:
|
|||
};
|
||||
|
||||
} // namespace zeek::threading::formatter
|
||||
|
||||
namespace threading::formatter {
|
||||
|
||||
using Ascii [[deprecated("Remove in v4.1. Use zeek::threading::formatter::Ascii.")]] = zeek::threading::formatter::Ascii;
|
||||
|
||||
} // namespace threading::formatter
|
||||
|
|
|
@ -45,9 +45,3 @@ private:
|
|||
};
|
||||
|
||||
} // namespace zeek::threading::formatter
|
||||
|
||||
namespace threading::formatter {
|
||||
|
||||
using JSON [[deprecated("Remove in v4.1. Use zeek::threading::formatter::JSON.")]] = zeek::threading::formatter::JSON;
|
||||
|
||||
} // namespace threading::formatter
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue