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
f2473e03
Unverified
Commit
f2473e03
authored
Dec 25, 2017
by
Dominik Charousset
Committed by
GitHub
Dec 25, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #641
Fix build on msvc
parents
9dbcc11d
d3457bf7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+1
-1
libcaf_io/src/ip_endpoint.cpp
libcaf_io/src/ip_endpoint.cpp
+5
-1
No files found.
libcaf_io/src/default_multiplexer.cpp
View file @
f2473e03
...
@@ -683,7 +683,7 @@ bool read_datagram(size_t& result, native_socket fd, void* buf, size_t buf_len,
...
@@ -683,7 +683,7 @@ bool read_datagram(size_t& result, native_socket fd, void* buf, size_t buf_len,
CAF_LOG_TRACE
(
CAF_ARG
(
fd
));
CAF_LOG_TRACE
(
CAF_ARG
(
fd
));
memset
(
ep
.
address
(),
0
,
sizeof
(
sockaddr_storage
));
memset
(
ep
.
address
(),
0
,
sizeof
(
sockaddr_storage
));
socklen_t
len
=
sizeof
(
sockaddr_storage
);
socklen_t
len
=
sizeof
(
sockaddr_storage
);
auto
sres
=
::
recvfrom
(
fd
,
buf
,
buf_len
,
0
,
ep
.
address
(),
&
len
);
auto
sres
=
::
recvfrom
(
fd
,
static_cast
<
socket_recv_ptr
>
(
buf
)
,
buf_len
,
0
,
ep
.
address
(),
&
len
);
if
(
is_error
(
sres
,
true
))
{
if
(
is_error
(
sres
,
true
))
{
CAF_LOG_ERROR
(
"recvfrom returned"
<<
CAF_ARG
(
sres
));
CAF_LOG_ERROR
(
"recvfrom returned"
<<
CAF_ARG
(
sres
));
return
false
;
return
false
;
...
...
libcaf_io/src/ip_endpoint.cpp
View file @
f2473e03
...
@@ -23,10 +23,10 @@
...
@@ -23,10 +23,10 @@
#include "caf/logger.hpp"
#include "caf/logger.hpp"
#ifdef CAF_WINDOWS
#ifdef CAF_WINDOWS
# include <windows.h>
# include <winsock2.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# include <ws2tcpip.h>
# include <ws2ipdef.h>
# include <ws2ipdef.h>
# include <windows.h>
#else
#else
# include <unistd.h>
# include <unistd.h>
# include <cerrno>
# include <cerrno>
...
@@ -36,6 +36,10 @@
...
@@ -36,6 +36,10 @@
# include <netinet/ip.h>
# include <netinet/ip.h>
#endif
#endif
#ifdef CAF_WINDOWS
using
sa_family_t
=
short
;
#endif
namespace
{
namespace
{
template
<
class
SizeType
=
size_t
>
template
<
class
SizeType
=
size_t
>
...
...
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