Skip to content

remove useless calls #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexInLog merged 1 commit into from
Sep 19, 2024
Merged

remove useless calls #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/rpp/rpp/operators/concat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ namespace rpp::operators::details
void on_error(const std::exception_ptr& err) const
{
state->get_observer()->on_error(err);
state->get_disposable()->dispose();
}

void set_upstream(const disposable_wrapper& d) const { refcounted.add(d); }
Expand Down
2 changes: 0 additions & 2 deletions src/rpp/rpp/operators/switch_on_next.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ namespace rpp::operators::details
void on_error(const std::exception_ptr& err) const
{
m_state->get_observer()->on_error(err);
m_state->dispose();
}

void on_completed() const
Expand Down Expand Up @@ -107,7 +106,6 @@ namespace rpp::operators::details
void on_error(const std::exception_ptr& err) const
{
m_state->get_observer()->on_error(err);
m_state->dispose();
}

void on_completed() const
Expand Down
19 changes: 4 additions & 15 deletions src/rpp/rpp/operators/timeout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ namespace rpp::operators::details

void on_error(const std::exception_ptr& err) const
{
disposable->dispose();
disposable->get_observer_with_timeout_under_lock()->observer.on_error(err);
}
};
Expand Down Expand Up @@ -89,26 +88,16 @@ namespace rpp::operators::details

void on_error(const std::exception_ptr& err) const noexcept
{
{
const auto obs_with_timeout = disposable->get_observer_with_timeout_under_lock();
if (disposable->is_disposed())
return;

const auto obs_with_timeout = disposable->get_observer_with_timeout_under_lock();
if (!disposable->is_disposed())
obs_with_timeout->observer.on_error(err);
}
disposable->dispose();
}

void on_completed() const noexcept
{
{
const auto obs_with_timeout = disposable->get_observer_with_timeout_under_lock();
if (disposable->is_disposed())
return;

const auto obs_with_timeout = disposable->get_observer_with_timeout_under_lock();
if (!disposable->is_disposed())
obs_with_timeout->observer.on_completed();
}
disposable->dispose();
}
};

Expand Down
2 changes: 0 additions & 2 deletions src/rpp/rpp/sources/concat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ namespace rpp::details
catch (...)
{
this->observer.on_error(std::current_exception());
this->disposable.dispose();
}
}

Expand Down Expand Up @@ -94,7 +93,6 @@ namespace rpp::details
if (state->itr.value() == std::cend(state->container))
{
state->observer.on_completed();
state->disposable.dispose();
return;
}

Expand Down