Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lsignal.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ SOFTWARE.
#ifndef LSIGNAL_H
#define LSIGNAL_H

#include <algorithm>
#include <functional>
#include <list>
#include <memory>
Expand Down Expand Up @@ -399,7 +400,7 @@ namespace lsignal
{
for (signal *sig : _children)
{
sig->operator()(std::forward<Args>(args)...);
sig->operator()(args...);
}

for (auto iter = _callbacks.cbegin(); iter != _callbacks.cend(); ++iter)
Expand All @@ -410,10 +411,10 @@ namespace lsignal
{
if (std::next(iter, 1) == _callbacks.cend())
{
return jnt.callback(std::forward<Args>(args)...);
return jnt.callback(args...);
}

jnt.callback(std::forward<Args>(args)...);
jnt.callback(args...);
}
}
}
Expand All @@ -433,7 +434,7 @@ namespace lsignal
{
for (signal *sig : _children)
{
sig->operator()(std::forward<Args>(args)...);
sig->operator()(args...);
}

result.reserve(_callbacks.size());
Expand All @@ -444,7 +445,7 @@ namespace lsignal

if (!jnt.connection->locked)
{
result.push_back(std::move(jnt.callback(std::forward<Args>(args)...)));
result.push_back(std::move(jnt.callback(args...)));
}
}
}
Expand Down