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
51d5d9d3
Commit
51d5d9d3
authored
May 19, 2015
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix variant for more than 14 types
parent
e192f9bc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
libcaf_core/caf/detail/variant_data.hpp
libcaf_core/caf/detail/variant_data.hpp
+10
-10
libcaf_core/caf/variant.hpp
libcaf_core/caf/variant.hpp
+2
-1
No files found.
libcaf_core/caf/detail/variant_data.hpp
View file @
51d5d9d3
...
...
@@ -30,12 +30,12 @@
#define CAF_VARIANT_DATA_GETTER(pos) \
inline CAF_VARIANT_DATA_CONCAT(T, pos) & \
get(std::integral_constant<int, pos
>) {
\
return CAF_VARIANT_DATA_CONCAT(v, pos)
;
\
get(std::integral_constant<int, pos
>) {
\
return CAF_VARIANT_DATA_CONCAT(v, pos)
;
\
} \
inline const CAF_VARIANT_DATA_CONCAT(T, pos) & \
get(std::integral_constant<int, pos
>) const {
\
return CAF_VARIANT_DATA_CONCAT(v, pos)
;
\
get(std::integral_constant<int, pos
>) const {
\
return CAF_VARIANT_DATA_CONCAT(v, pos)
;
\
}
namespace
caf
{
...
...
@@ -56,8 +56,8 @@ struct variant_data {
T6
v6
;
T7
v7
;
T8
v8
;
T9
v9
;
T10
v10
;
T11
v11
;
T12
v12
;
T13
v13
;
T14
v14
;
T1
1
v15
;
T12
v16
;
T13
v17
;
T1
4
v18
;
T15
v19
;
T20
v20
;
T1
5
v15
;
T16
v16
;
T17
v17
;
T1
8
v18
;
T19
v19
;
T20
v20
;
};
variant_data
()
{
}
...
...
libcaf_core/caf/variant.hpp
View file @
51d5d9d3
...
...
@@ -57,7 +57,8 @@ struct variant_move_helper {
template
<
class
T
,
class
U
,
bool
Enable
=
std
::
is_integral
<
T
>
::
value
&&
std
::
is_integral
<
U
>::
value
>
&&
std
::
is_integral
<
U
>::
value
&&
!
std
::
is_same
<
T
,
bool
>::
value
>
struct
is_equal_int_type
{
static
constexpr
bool
value
=
sizeof
(
T
)
==
sizeof
(
U
)
&&
std
::
is_signed
<
T
>::
value
...
...
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