Skip to content

Commit a3e2fe6

Browse files
committed
signal_base: Do not derive from trackable.
Because we don't seem to actually use the trackable API when using these objects. There was a call to notify_callbacks(), but that cannot have done anything, because nothing registers any callbacks with the base trackable, and now cannot possibly register any callbacks, because it's no longer a trackable.
1 parent 2f5d337 commit a3e2fe6

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

sigc++/signal_base.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ signal_base::signal_base() noexcept
204204
{
205205
}
206206

207-
signal_base::signal_base(const signal_base& src) noexcept : trackable(), impl_(src.impl())
207+
signal_base::signal_base(const signal_base& src) noexcept : impl_(src.impl())
208208
{
209209
}
210210

211-
signal_base::signal_base(signal_base&& src) : trackable(std::move(src)), impl_(std::move(src.impl_))
211+
signal_base::signal_base(signal_base&& src) : impl_(std::move(src.impl_))
212212
{
213213
src.impl_ = nullptr;
214214
}
@@ -296,7 +296,6 @@ signal_base::operator=(signal_base&& src)
296296
if (src.impl_ == impl_)
297297
return *this;
298298

299-
src.notify_callbacks();
300299
impl_ = src.impl_;
301300
src.impl_ = nullptr;
302301

sigc++/signal_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ struct SIGC_API signal_impl_holder
289289
*
290290
* @ingroup signal
291291
*/
292-
struct SIGC_API signal_base : public trackable
292+
struct SIGC_API signal_base
293293
{
294294
using size_type = std::size_t;
295295

0 commit comments

Comments
 (0)