Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
e192f9bc
Commit
e192f9bc
authored
May 19, 2015
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix shadowing warning, remove cout
parent
85e06cd6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
libcaf_io/caf/io/network/asio_multiplexer.hpp
libcaf_io/caf/io/network/asio_multiplexer.hpp
+2
-2
libcaf_io/src/asio_multiplexer.cpp
libcaf_io/src/asio_multiplexer.cpp
+0
-2
No files found.
libcaf_io/caf/io/network/asio_multiplexer.hpp
View file @
e192f9bc
...
@@ -337,8 +337,8 @@ class acceptor {
...
@@ -337,8 +337,8 @@ class acceptor {
*/
*/
using
manager_ptr
=
intrusive_ptr
<
manager_type
>
;
using
manager_ptr
=
intrusive_ptr
<
manager_type
>
;
acceptor
(
asio_multiplexer
&
backend
,
io_backend
&
io
)
acceptor
(
asio_multiplexer
&
am
,
io_backend
&
io
)
:
m_backend
(
backend
),
m_accept_fd
(
io
),
m_fd
(
io
)
{}
:
m_backend
(
am
),
m_accept_fd
(
io
),
m_fd
(
io
)
{}
/**
/**
* Returns the `multiplexer` this acceptor belongs to.
* Returns the `multiplexer` this acceptor belongs to.
...
...
libcaf_io/src/asio_multiplexer.cpp
View file @
e192f9bc
...
@@ -47,7 +47,6 @@ struct asio_supervisor : public multiplexer::supervisor {
...
@@ -47,7 +47,6 @@ struct asio_supervisor : public multiplexer::supervisor {
default_socket
new_tcp_connection
(
io_backend
&
backend
,
const
std
::
string
&
host
,
default_socket
new_tcp_connection
(
io_backend
&
backend
,
const
std
::
string
&
host
,
uint16_t
port
)
{
uint16_t
port
)
{
std
::
cout
<<
"new_tcp_connection start"
<<
std
::
endl
;
default_socket
fd
{
backend
};
default_socket
fd
{
backend
};
using
boost
::
asio
::
ip
::
tcp
;
using
boost
::
asio
::
ip
::
tcp
;
tcp
::
resolver
r
(
fd
.
get_io_service
());
tcp
::
resolver
r
(
fd
.
get_io_service
());
...
@@ -62,7 +61,6 @@ default_socket new_tcp_connection(io_backend& backend, const std::string& host,
...
@@ -62,7 +61,6 @@ default_socket new_tcp_connection(io_backend& backend, const std::string& host,
throw
network_error
(
"could not connect to host: "
+
host
+
throw
network_error
(
"could not connect to host: "
+
host
+
":"
+
std
::
to_string
(
port
));
":"
+
std
::
to_string
(
port
));
}
}
std
::
cout
<<
"new_tcp_connection end (no exception)"
<<
std
::
endl
;
return
fd
;
return
fd
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment