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
03c6347a
Commit
03c6347a
authored
Aug 11, 2023
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings on GCC 13
parent
1d0bed3a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
50 deletions
+36
-50
libcaf_core/caf/config_value.cpp
libcaf_core/caf/config_value.cpp
+6
-6
libcaf_core/caf/config_value.hpp
libcaf_core/caf/config_value.hpp
+25
-39
libcaf_core/caf/detail/config_consumer.hpp
libcaf_core/caf/detail/config_consumer.hpp
+1
-1
libcaf_core/caf/flow/step/take_last.hpp
libcaf_core/caf/flow/step/take_last.hpp
+1
-1
libcaf_test/caf/test/fixture/deterministic.hpp
libcaf_test/caf/test/fixture/deterministic.hpp
+3
-3
No files found.
libcaf_core/caf/config_value.cpp
View file @
03c6347a
...
...
@@ -167,12 +167,12 @@ type_id_t config_value::type_id() const noexcept {
error_code
<
sec
>
config_value
::
default_construct
(
type_id_t
id
)
{
switch
(
id
)
{
case
type_id_v
<
bool
>
:
set
(
false
)
;
data_
=
false
;
return
sec
::
none
;
case
type_id_v
<
double
>
:
case
type_id_v
<
float
>
:
case
type_id_v
<
long
double
>
:
set
(
0.0
)
;
data_
=
0.0
;
return
sec
::
none
;
case
type_id_v
<
int16_t
>
:
case
type_id_v
<
int32_t
>
:
...
...
@@ -182,16 +182,16 @@ error_code<sec> config_value::default_construct(type_id_t id) {
case
type_id_v
<
uint32_t
>
:
case
type_id_v
<
uint64_t
>
:
case
type_id_v
<
uint8_t
>
:
set
(
0
)
;
data_
=
int64_t
{
0
}
;
return
sec
::
none
;
case
type_id_v
<
std
:
:
string
>:
set
(
std
::
string
{})
;
data_
=
std
::
string
{}
;
return
sec
::
none
;
case
type_id_v
<
timespan
>
:
set
(
timespan
{})
;
data_
=
timespan
{}
;
return
sec
::
none
;
case
type_id_v
<
uri
>
:
set
(
uri
{})
;
data_
=
uri
{}
;
return
sec
::
none
;
default:
if
(
auto
meta
=
detail
::
global_meta_object_or_null
(
id
))
{
...
...
libcaf_core/caf/config_value.hpp
View file @
03c6347a
...
...
@@ -99,8 +99,8 @@ public:
template
<
class
T
,
class
E
=
detail
::
enable_if_t
<
!
std
::
is_same_v
<
detail
::
decay_t
<
T
>,
config_value
>>>
explicit
config_value
(
T
&&
x
)
{
set
(
std
::
forward
<
T
>
(
x
));
explicit
config_value
(
T
&&
x
)
:
data_
(
lift
(
std
::
forward
<
T
>
(
x
)))
{
// nop
}
config_value
&
operator
=
(
config_value
&&
other
)
=
default
;
...
...
@@ -110,7 +110,7 @@ public:
template
<
class
T
,
class
E
=
detail
::
enable_if_t
<
!
std
::
is_same_v
<
detail
::
decay_t
<
T
>,
config_value
>>>
config_value
&
operator
=
(
T
&&
x
)
{
se
t
(
std
::
forward
<
T
>
(
x
));
data_
=
lif
t
(
std
::
forward
<
T
>
(
x
));
return
*
this
;
}
...
...
@@ -271,47 +271,33 @@ private:
// -- auto conversion of related types ---------------------------------------
template
<
class
T
>
void
set_range
(
T
&
xs
,
std
::
true_type
)
{
auto
&
dict
=
as_dictionary
();
dict
.
clear
();
for
(
auto
&
[
key
,
val
]
:
xs
)
dict
.
emplace
(
key
,
std
::
move
(
val
));
}
template
<
class
T
>
void
set_range
(
T
&
xs
,
std
::
false_type
)
{
auto
&
ls
=
as_list
();
ls
.
clear
();
ls
.
insert
(
ls
.
end
(),
std
::
make_move_iterator
(
xs
.
begin
()),
std
::
make_move_iterator
(
xs
.
end
()));
}
template
<
class
T
>
void
set
(
T
x
)
{
auto
lift
(
T
x
)
{
if
constexpr
(
detail
::
is_config_value_type_v
<
T
>
)
{
data_
=
std
::
move
(
x
)
;
return
x
;
}
else
if
constexpr
(
std
::
is_integral
<
T
>::
value
)
{
data_
=
static_cast
<
int64_t
>
(
x
);
}
else
if
constexpr
(
std
::
is_convertible
<
T
,
const
char
*>::
value
)
{
data_
=
std
::
string
{
x
};
return
static_cast
<
int64_t
>
(
x
);
}
else
if
constexpr
(
std
::
is_same
<
T
,
float
>::
value
)
{
return
static_cast
<
double
>
(
x
);
}
else
if
constexpr
(
std
::
is_convertible_v
<
T
,
const
char
*>
)
{
return
std
::
string
{
x
};
}
else
if
constexpr
(
std
::
is_same_v
<
T
,
std
::
string_view
>
)
{
return
std
::
string
{
x
};
}
else
{
static_assert
(
detail
::
is_iterable
<
T
>::
value
);
static_assert
(
detail
::
is_iterable
_v
<
T
>
);
using
value_type
=
typename
T
::
value_type
;
detail
::
bool_token
<
detail
::
is_pair
<
value_type
>::
value
>
is_map_type
;
set_range
(
x
,
is_map_type
);
}
if
constexpr
(
detail
::
is_pair
<
value_type
>::
value
)
{
dictionary
result
;
for
(
auto
&
[
key
,
val
]
:
x
)
result
.
emplace
(
std
::
move
(
key
),
std
::
move
(
val
));
return
result
;
}
else
{
list
result
;
result
.
reserve
(
x
.
size
());
for
(
auto
&
val
:
x
)
result
.
emplace_back
(
std
::
move
(
val
));
return
result
;
}
void
set
(
float
x
)
{
data_
=
static_cast
<
double
>
(
x
);
}
void
set
(
const
char
*
x
)
{
data_
=
std
::
string
{
x
};
}
void
set
(
std
::
string_view
x
)
{
data_
=
std
::
string
{
x
.
begin
(),
x
.
end
()};
}
// -- member variables -------------------------------------------------------
...
...
libcaf_core/caf/detail/config_consumer.hpp
View file @
03c6347a
...
...
@@ -140,7 +140,7 @@ public:
template
<
class
T
>
void
value
(
T
&&
x
)
{
result
=
config_value
{
std
::
forward
<
T
>
(
x
)}
;
result
=
std
::
forward
<
T
>
(
x
)
;
}
config_list_consumer
begin_list
();
...
...
libcaf_core/caf/flow/step/take_last.hpp
View file @
03c6347a
...
...
@@ -28,7 +28,7 @@ public:
take_last
&
operator
=
(
const
take_last
&
)
=
default
;
template
<
class
Next
,
class
...
Steps
>
bool
on_next
(
const
input_type
&
item
,
Next
&
next
,
Steps
&
...
steps
)
{
bool
on_next
(
const
input_type
&
item
,
Next
&
,
Steps
&
...
)
{
elements_
.
push_back
(
item
);
return
true
;
}
...
...
libcaf_test/caf/test/fixture/deterministic.hpp
View file @
03c6347a
...
...
@@ -229,14 +229,14 @@ public:
/// Adds a predicate for the sender of the next message that matches only if
/// the sender is `src`.
evaluator
&&
from
(
const
strong_actor_ptr
&
src
)
&&
{
from_
=
value_predicate
<
strong_actor_ptr
>
{
s
td
::
move
(
src
)
};
from_
=
value_predicate
<
strong_actor_ptr
>
{
s
rc
};
return
std
::
move
(
*
this
);
}
/// Adds a predicate for the sender of the next message that matches only if
/// the sender is `src`.
evaluator
&&
from
(
const
actor
&
src
)
&&
{
from_
=
value_predicate
<
strong_actor_ptr
>
{
s
td
::
move
(
src
)
};
from_
=
value_predicate
<
strong_actor_ptr
>
{
s
rc
};
return
std
::
move
(
*
this
);
}
...
...
@@ -244,7 +244,7 @@ public:
/// the sender is `src`.
template
<
class
...
Us
>
evaluator
&&
from
(
const
typed_actor
<
Us
...
>&
src
)
&&
{
from_
=
value_predicate
<
strong_actor_ptr
>
{
s
td
::
move
(
src
)
};
from_
=
value_predicate
<
strong_actor_ptr
>
{
s
rc
};
return
std
::
move
(
*
this
);
}
...
...
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