aboutsummaryrefslogtreecommitdiff
path: root/src/control_connection.cpp
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@gmail.com>2018-11-30 16:52:54 +0100
committerFelix Morgner <felix.morgner@gmail.com>2018-11-30 16:52:54 +0100
commit3abece6f0a7edca476ee0c493f30dda8f8bcefd5 (patch)
treee794f512a262cca92db6d0a5f9d41b6be64d9db0 /src/control_connection.cpp
parent9c2231c8fb45f32c7b1d23e14125bc58ea405e60 (diff)
downloadwanda-3abece6f0a7edca476ee0c493f30dda8f8bcefd5.tar.xz
wanda-3abece6f0a7edca476ee0c493f30dda8f8bcefd5.zip
core: stop ownership circles in connection
Diffstat (limited to 'src/control_connection.cpp')
-rw-r--r--src/control_connection.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control_connection.cpp b/src/control_connection.cpp
index 586b5de..c06d489 100644
--- a/src/control_connection.cpp
+++ b/src/control_connection.cpp
@@ -17,13 +17,13 @@ control_connection::control_connection(control_connection::key key, control_conn
{
}
-bool control_connection::add(std::shared_ptr<control_connection::listener> listener)
+bool control_connection::add(listener * listener)
{
auto [_, inserted] = m_listeners.insert(listener);
return inserted;
}
-bool control_connection::remove(std::shared_ptr<control_connection::listener> listener)
+bool control_connection::remove(listener * listener)
{
return m_listeners.erase(listener);
}
@@ -92,9 +92,9 @@ void control_connection::perform_read()
{
auto msg = message{};
m_input >> msg;
- m_input.ignore(std::numeric_limits<std::streamsize>::max());
if (!m_input)
{
+ m_input.ignore(std::numeric_limits<std::streamsize>::max());
m_input.clear();
}
else