diff --git a/src/Trigger.cc b/src/Trigger.cc index 3dfe76e2dc..d165da7f5a 100644 --- a/src/Trigger.cc +++ b/src/Trigger.cc @@ -89,12 +89,6 @@ protected: double time; }; -Trigger::Trigger(std::shared_ptr wi, double timeout, const IDSet& _globals, std::vector _local_aggrs, - Frame* f, const Location* loc) - : Trigger(std::move(wi), _globals, std::move(_local_aggrs), timeout, f, loc) { - Unref(this); -} - Trigger::Trigger(std::shared_ptr wi, const IDSet& _globals, std::vector _local_aggrs, double timeout, Frame* f, const Location* loc) { timeout_value = timeout; diff --git a/src/Trigger.h b/src/Trigger.h index 5955cc25b4..0cba28fd20 100644 --- a/src/Trigger.h +++ b/src/Trigger.h @@ -46,13 +46,6 @@ class TriggerTraversalCallback; class Trigger final : public Obj, public notifier::detail::Receiver { public: - // This first constructor can return an invalid pointer, so - // its value must not be used further. - [[deprecated( - "Remove in v7.1. Use second Trigger constructor via " - "make_intrusive<...>.")]] Trigger(std::shared_ptr wi, double timeout, const IDSet& globals, - std::vector local_aggrs, Frame* f, const Location* loc); - // Use this constructor via make_intrusive<...>. The usual pattern is // to then discard what's returned, i.e. "(void)make_intrusive<...>" - // however, a valid pointer will be returned that can be used for