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
7ae65c39
Commit
7ae65c39
authored
Apr 11, 2018
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix shadowing of base class member
parent
8be5a792
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
libcaf_core/caf/forwarding_actor_proxy.hpp
libcaf_core/caf/forwarding_actor_proxy.hpp
+1
-1
libcaf_core/src/forwarding_actor_proxy.cpp
libcaf_core/src/forwarding_actor_proxy.cpp
+2
-2
No files found.
libcaf_core/caf/forwarding_actor_proxy.hpp
View file @
7ae65c39
...
@@ -46,7 +46,7 @@ private:
...
@@ -46,7 +46,7 @@ private:
void
forward_msg
(
strong_actor_ptr
sender
,
message_id
mid
,
message
msg
,
void
forward_msg
(
strong_actor_ptr
sender
,
message_id
mid
,
message
msg
,
const
forwarding_stack
*
fwd
=
nullptr
);
const
forwarding_stack
*
fwd
=
nullptr
);
mutable
detail
::
shared_spinlock
mtx_
;
mutable
detail
::
shared_spinlock
broker_
mtx_
;
actor
broker_
;
actor
broker_
;
};
};
...
...
libcaf_core/src/forwarding_actor_proxy.cpp
View file @
7ae65c39
...
@@ -45,7 +45,7 @@ void forwarding_actor_proxy::forward_msg(strong_actor_ptr sender,
...
@@ -45,7 +45,7 @@ void forwarding_actor_proxy::forward_msg(strong_actor_ptr sender,
if
(
msg
.
match_elements
<
exit_msg
>
())
if
(
msg
.
match_elements
<
exit_msg
>
())
unlink_from
(
msg
.
get_as
<
exit_msg
>
(
0
).
source
);
unlink_from
(
msg
.
get_as
<
exit_msg
>
(
0
).
source
);
forwarding_stack
tmp
;
forwarding_stack
tmp
;
shared_lock
<
detail
::
shared_spinlock
>
guard
(
mtx_
);
shared_lock
<
detail
::
shared_spinlock
>
guard
(
broker_
mtx_
);
if
(
broker_
)
if
(
broker_
)
broker_
->
enqueue
(
nullptr
,
invalid_message_id
,
broker_
->
enqueue
(
nullptr
,
invalid_message_id
,
make_message
(
forward_atom
::
value
,
std
::
move
(
sender
),
make_message
(
forward_atom
::
value
,
std
::
move
(
sender
),
...
@@ -85,7 +85,7 @@ void forwarding_actor_proxy::kill_proxy(execution_unit* ctx, error rsn) {
...
@@ -85,7 +85,7 @@ void forwarding_actor_proxy::kill_proxy(execution_unit* ctx, error rsn) {
CAF_ASSERT
(
ctx
!=
nullptr
);
CAF_ASSERT
(
ctx
!=
nullptr
);
actor
tmp
;
actor
tmp
;
{
// lifetime scope of guard
{
// lifetime scope of guard
std
::
unique_lock
<
detail
::
shared_spinlock
>
guard
(
mtx_
);
std
::
unique_lock
<
detail
::
shared_spinlock
>
guard
(
broker_
mtx_
);
broker_
.
swap
(
tmp
);
// manually break cycle
broker_
.
swap
(
tmp
);
// manually break cycle
}
}
cleanup
(
std
::
move
(
rsn
),
ctx
);
cleanup
(
std
::
move
(
rsn
),
ctx
);
...
...
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