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
bbf9df7d
Commit
bbf9df7d
authored
Feb 20, 2015
by
Marian Triebe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Coding style nitpicks
parent
47f19c7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
33 deletions
+15
-33
libcaf_core/caf/detail/decorated_tuple.hpp
libcaf_core/caf/detail/decorated_tuple.hpp
+6
-15
libcaf_core/src/decorated_tuple.cpp
libcaf_core/src/decorated_tuple.cpp
+5
-13
libcaf_core/src/message.cpp
libcaf_core/src/message.cpp
+4
-5
No files found.
libcaf_core/caf/detail/decorated_tuple.hpp
View file @
bbf9df7d
...
...
@@ -36,19 +36,15 @@ namespace caf {
namespace
detail
{
class
decorated_tuple
:
public
message_data
{
using
super
=
message_data
;
decorated_tuple
&
operator
=
(
const
decorated_tuple
&
)
=
delete
;
public:
decorated_tuple
&
operator
=
(
const
decorated_tuple
&
)
=
delete
;
using
vector_type
=
std
::
vector
<
size_t
>
;
using
pointer
=
message_data
::
ptr
;
// creates a typed subtuple from `d` with mapping `v`
static
pointer
creat
e
(
pointer
d
,
vector_type
v
);
static
pointer
mak
e
(
pointer
d
,
vector_type
v
);
void
*
mutable_at
(
size_t
pos
)
override
;
...
...
@@ -67,26 +63,21 @@ class decorated_tuple : public message_data {
uint16_t
type_nr_at
(
size_t
pos
)
const
override
;
const
pointer
&
decorated
()
const
{
inline
const
pointer
&
decorated
()
const
{
return
m_decorated
;
}
const
vector_type
&
mapping
()
const
{
inline
const
vector_type
&
mapping
()
const
{
return
m_mapping
;
}
private:
decorated_tuple
(
pointer
&&
,
vector_type
&&
);
decorated_tuple
(
const
decorated_tuple
&
)
=
default
;
pointer
m_decorated
;
vector_type
m_mapping
;
uint32_t
m_type_token
;
void
init
();
decorated_tuple
(
pointer
,
vector_type
&&
);
decorated_tuple
(
const
decorated_tuple
&
)
=
default
;
};
}
// namespace detail
...
...
libcaf_core/src/decorated_tuple.cpp
View file @
bbf9df7d
...
...
@@ -22,11 +22,7 @@
namespace
caf
{
namespace
detail
{
using
vector_type
=
std
::
vector
<
size_t
>
;
using
pointer
=
message_data
::
ptr
;
pointer
decorated_tuple
::
create
(
pointer
d
,
vector_type
v
)
{
decorated_tuple
::
pointer
decorated_tuple
::
make
(
pointer
d
,
vector_type
v
)
{
auto
ptr
=
dynamic_cast
<
const
decorated_tuple
*>
(
d
.
get
());
if
(
ptr
)
{
d
=
ptr
->
decorated
();
...
...
@@ -73,7 +69,10 @@ uint16_t decorated_tuple::type_nr_at(size_t pos) const {
return
m_decorated
->
type_nr_at
(
m_mapping
[
pos
]);
}
void
decorated_tuple
::
init
()
{
decorated_tuple
::
decorated_tuple
(
pointer
&&
d
,
vector_type
&&
v
)
:
m_decorated
(
std
::
move
(
d
)),
m_mapping
(
std
::
move
(
v
)),
m_type_token
(
0xFFFFFFFF
)
{
CAF_REQUIRE
(
m_mapping
.
empty
()
||
*
(
std
::
max_element
(
m_mapping
.
begin
(),
m_mapping
.
end
()))
<
static_cast
<
const
pointer
&>
(
m_decorated
)
->
size
());
...
...
@@ -84,12 +83,5 @@ void decorated_tuple::init() {
}
}
decorated_tuple
::
decorated_tuple
(
pointer
d
,
vector_type
&&
v
)
:
m_decorated
(
std
::
move
(
d
)),
m_mapping
(
std
::
move
(
v
)),
m_type_token
(
0xFFFFFFFF
)
{
init
();
}
}
// namespace detail
}
// namespace caf
libcaf_core/src/message.cpp
View file @
bbf9df7d
...
...
@@ -89,7 +89,7 @@ message message::drop(size_t n) const {
std
::
vector
<
size_t
>
mapping
(
size
()
-
n
);
size_t
i
=
n
;
std
::
generate
(
mapping
.
begin
(),
mapping
.
end
(),
[
&
]
{
return
i
++
;
});
return
message
{
detail
::
decorated_tuple
::
creat
e
(
m_vals
,
mapping
)};
return
message
{
detail
::
decorated_tuple
::
mak
e
(
m_vals
,
mapping
)};
}
message
message
::
drop_right
(
size_t
n
)
const
{
...
...
@@ -102,7 +102,7 @@ message message::drop_right(size_t n) const {
}
std
::
vector
<
size_t
>
mapping
(
size
()
-
n
);
std
::
iota
(
mapping
.
begin
(),
mapping
.
end
(),
size_t
{
0
});
return
message
{
detail
::
decorated_tuple
::
creat
e
(
m_vals
,
std
::
move
(
mapping
))};
return
message
{
detail
::
decorated_tuple
::
mak
e
(
m_vals
,
std
::
move
(
mapping
))};
}
message
message
::
slice
(
size_t
pos
,
size_t
n
)
const
{
...
...
@@ -112,7 +112,7 @@ message message::slice(size_t pos, size_t n) const {
}
std
::
vector
<
size_t
>
mapping
(
std
::
min
(
s
-
pos
,
n
));
std
::
iota
(
mapping
.
begin
(),
mapping
.
end
(),
pos
);
return
message
{
detail
::
decorated_tuple
::
creat
e
(
m_vals
,
std
::
move
(
mapping
))};
return
message
{
detail
::
decorated_tuple
::
mak
e
(
m_vals
,
std
::
move
(
mapping
))};
}
optional
<
message
>
message
::
apply
(
message_handler
handler
)
{
...
...
@@ -133,8 +133,7 @@ message message::extract_impl(size_t start, message_handler handler) const {
if
(
mapping
.
empty
())
{
return
message
{};
}
message
next
{
detail
::
decorated_tuple
::
create
(
m_vals
,
std
::
move
(
mapping
))};
message
next
{
detail
::
decorated_tuple
::
make
(
m_vals
,
std
::
move
(
mapping
))};
return
next
.
extract_impl
(
i
,
handler
);
}
}
...
...
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