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

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

6
src/input/Component.h
View file

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

8
src/input/Manager.h
View file

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

12
src/input/ReaderBackend.h
View file

@ -365,15 +365,3 @@ private:
};
} // namespace zeek::input
namespace input {
using ReaderMode [[deprecated("Remove in v4.1. Use zeek::input::ReaderMode.")]] = zeek::input::ReaderMode;
constexpr auto MODE_MANUAL [[deprecated("Remove in v4.1. Use zeek::input::MODE_MANUAL.")]] = zeek::input::MODE_MANUAL;
constexpr auto MODE_REREAD [[deprecated("Remove in v4.1. Use zeek::input::MODE_REREAD.")]] = zeek::input::MODE_REREAD;
constexpr auto MODE_STREAM [[deprecated("Remove in v4.1. Use zeek::input::MODE_STREAM.")]] = zeek::input::MODE_STREAM;
constexpr auto MODE_NONE [[deprecated("Remove in v4.1. Use zeek::input::MODE_NONE.")]] = zeek::input::MODE_NONE;
using ReaderBackend [[deprecated("Remove in v4.1. Use zeek::input::ReaderBackend.")]] = zeek::input::ReaderBackend;
} // namespace input

6
src/input/ReaderFrontend.h
View file

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

9
src/input/Tag.cc
View file

@ -23,17 +23,8 @@ const EnumValPtr& Tag::AsVal() const
return zeek::Tag::AsVal(input_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::input

20
src/input/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, input);
ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, input);
@ -91,9 +83,6 @@ public:
*/
const EnumValPtr& AsVal() const;
[[deprecated("Remove in v4.1. Use AsVal() instead.")]]
EnumVal* AsEnumVal() const;
static const Tag Error;
protected:
@ -118,15 +107,6 @@ protected:
* @param val An enum value of script type \c Input::Reader.
*/
explicit Tag(EnumValPtr val);
[[deprecated("Remove in v4.1. Construct from IntrusivePtr isntead.")]]
explicit Tag(EnumVal* val);
};
} // namespace zeek::input
namespace input {
using Tag [[deprecated("Remove in v4.1. Use zeek::input::Tag.")]] = zeek::input::Tag;
} // namespace input

7
src/input/readers/ascii/Ascii.h
View file

@ -86,10 +86,3 @@ private:
};
} // namespace zeek::input::reader::detail
namespace input::reader {
using FieldMapping [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::FieldMapping.")]] = zeek::input::reader::detail::FieldMapping;
using Ascii [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Ascii.")]] = zeek::input::reader::detail::Ascii;
} // namespace input::reader

4
src/input/readers/benchmark/Benchmark.cc
View file

@ -12,8 +12,8 @@
#include "input/readers/benchmark/benchmark.bif.h"
using threading::Value;
using threading::Field;
using zeek::threading::Value;
using zeek::threading::Field;
namespace zeek::input::reader::detail {

6
src/input/readers/benchmark/Benchmark.h
View file

@ -43,9 +43,3 @@ private:
};
} // namespace zeek::input::reader
namespace input::reader {
using Benchmark [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Benchmark.")]] = zeek::input::reader::detail::Benchmark;
} // namespace input::reader

6
src/input/readers/binary/Binary.h
View file

@ -45,9 +45,3 @@ private:
};
} // namespace zeek::input::reader::detail
namespace input::reader {
using Binary [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Binary.")]] = zeek::input::reader::detail::Binary;
} // namespace input::reader

6
src/input/readers/config/Config.h
View file

@ -56,9 +56,3 @@ private:
};
} // namespace zeek::input::reader::detail
namespace input::reader {
using Config [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Config.")]] = zeek::input::reader::detail::Config;
} // namespace input::reader

6
src/input/readers/raw/Raw.h
View file

@ -90,9 +90,3 @@ private:
};
} // namespace zeek::input::reader::detail
namespace input::reader {
using Raw [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Raw.")]] = zeek::input::reader::detail::Raw;
} // namespace input::reader

6
src/input/readers/sqlite/SQLite.h
View file

@ -46,9 +46,3 @@ private:
};
} // namespace zeek::input::reader
namespace input::reader {
using SQLite [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::SQLite.")]] = zeek::input::reader::detail::SQLite;
} // namespace input::reader