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
817c6e01
Unverified
Commit
817c6e01
authored
Jun 26, 2020
by
Dominik Charousset
Committed by
GitHub
Jun 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply suggestions from code review
Co-authored-by:
Joseph Noir
<
josephnoir@users.noreply.github.com
>
parent
49ac3643
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
libcaf_core/caf/detail/config_consumer.hpp
libcaf_core/caf/detail/config_consumer.hpp
+1
-1
libcaf_core/src/actor_system_config.cpp
libcaf_core/src/actor_system_config.cpp
+1
-1
libcaf_core/src/detail/config_consumer.cpp
libcaf_core/src/detail/config_consumer.cpp
+1
-1
No files found.
libcaf_core/caf/detail/config_consumer.hpp
View file @
817c6e01
...
@@ -74,7 +74,7 @@ private:
...
@@ -74,7 +74,7 @@ private:
config_value
::
list
xs_
;
config_value
::
list
xs_
;
};
};
/// Consumes a series of key-vale pairs from an application configuration.
/// Consumes a series of key-val
u
e pairs from an application configuration.
class
CAF_CORE_EXPORT
config_consumer
{
class
CAF_CORE_EXPORT
config_consumer
{
public:
public:
// -- constructors, destructors, and assignment operators --------------------
// -- constructors, destructors, and assignment operators --------------------
...
...
libcaf_core/src/actor_system_config.cpp
View file @
817c6e01
...
@@ -352,7 +352,7 @@ error actor_system_config::parse(string_list args,
...
@@ -352,7 +352,7 @@ error actor_system_config::parse(string_list args,
if
(
!
conf
.
is_open
())
{
if
(
!
conf
.
is_open
())
{
conf
.
open
(
"caf-application.ini"
);
conf
.
open
(
"caf-application.ini"
);
if
(
conf
.
is_open
())
{
if
(
conf
.
is_open
())
{
// Consume the ini file here, because the parse() overlo
ead for taking
// Consume the ini file here, because the parse() overlo
ad that takes
// an istream assumes the new config format.
// an istream assumes the new config format.
if
(
auto
err
=
parse_ini
(
conf
,
custom_options_
,
content
))
if
(
auto
err
=
parse_ini
(
conf
,
custom_options_
,
content
))
return
err
;
return
err
;
...
...
libcaf_core/src/detail/config_consumer.cpp
View file @
817c6e01
...
@@ -156,7 +156,7 @@ void merge_into_place(settings& src, settings& dst) {
...
@@ -156,7 +156,7 @@ void merge_into_place(settings& src, settings& dst) {
}
// namespace
}
// namespace
pec
config_consumer
::
value_impl
(
config_value
&&
x
)
{
pec
config_consumer
::
value_impl
(
config_value
&&
x
)
{
// See whether there's a
n
config_option associated to this key and perform a
// See whether there's a config_option associated to this key and perform a
// type check if necessary.
// type check if necessary.
const
config_option
*
opt
;
const
config_option
*
opt
;
if
(
options_
==
nullptr
)
{
if
(
options_
==
nullptr
)
{
...
...
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