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

Remove all of the random single-file deprecations

Browse source 
These are the changes that don't require a ton of changes to other files outside
of the original removal.
This commit is contained in:
Tim Wojtulewicz 2021-01-21 11:49:36 -07:00
parent 7e9d89db0a
commit 0618be792f
270 changed files with 36 additions and 4632 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/logging/Manager.h
View file

@ -305,11 +305,3 @@ private:
extern logging::Manager* log_mgr;
} // namespace zeek
extern zeek::logging::Manager*& log_mgr [[deprecated("Remove in v4.1. Use zeek::log_mgr.")]];
namespace logging {
using Manager [[deprecated("Remove in v4.1. Use zeek::logging::Manager.")]] = zeek::logging::Manager;
} // namespace logging

9
src/logging/Tag.cc
View file

@ -29,17 +29,8 @@ const EnumValPtr& Tag::AsVal() const
return zeek::Tag::AsVal(log_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::logging

20
src/logging/Tag.h
View file

@ -11,14 +11,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, logging);
ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, logging);
@ -96,9 +88,6 @@ public:
*/
const EnumValPtr& AsVal() const;
[[deprecated("Remove in v4.1. Use AsVal() instead.")]]
EnumVal* AsEnumVal() const;
static const Tag Error;
protected:
@ -123,15 +112,6 @@ protected:
* @param val An enum value of script type \c Log::Writer.
*/
explicit Tag(EnumValPtr val);
[[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]]
explicit Tag(EnumVal* val);
};
} // namespace zeek::logging
namespace logging {
using Tag [[deprecated("Remove in v4.1. Use zeek::logging::Tag.")]] = zeek::logging::Tag;
} // namespace logging

6
src/logging/WriterBackend.h
View file

@ -399,9 +399,3 @@ private:
};
} // namespace zeek::logging
namespace logging {
using WriterBackend [[deprecated("Remove in v4.1. Use zeek::logging::WriterBackend.")]] = zeek::logging::WriterBackend;
} // namespace logging

6
src/logging/WriterFrontend.h
View file

@ -210,9 +210,3 @@ protected:
};
} // namespace zeek::logging
namespace logging {
using WriterFrontend [[deprecated("Remove in v4.1. Use zeek::logging::WriterFrontend.")]] = zeek::logging::WriterFrontend;
} // namespace logging