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
1b5d2e98
Commit
1b5d2e98
authored
Apr 19, 2021
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrate review feedback
parent
a02aa8d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
libcaf_core/caf/actor_system_config.hpp
libcaf_core/caf/actor_system_config.hpp
+5
-5
libcaf_core/src/actor_system_config.cpp
libcaf_core/src/actor_system_config.cpp
+1
-1
No files found.
libcaf_core/caf/actor_system_config.hpp
View file @
1b5d2e98
...
...
@@ -94,7 +94,7 @@ public:
/// configuration file.
error
parse
(
string_list
args
,
std
::
istream
&
config
);
/// Parses `args` as CLI options and tries locate a config file via
/// Parses `args` as CLI options and tries
to
locate a config file via
/// `config_file_path` and `config_file_path_alternative` unless the user
/// provides a config file path on the command line.
error
parse
(
string_list
args
);
...
...
@@ -105,9 +105,9 @@ public:
/// Parses the CLI options `{argc, argv}` and `config` as configuration file.
error
parse
(
int
argc
,
char
**
argv
,
std
::
istream
&
config
);
/// Parses the CLI options `{argc, argv}` and tries to
open `config_file_cstr`
///
as config file. The parsers tries to open `caf-application.conf` if
///
`config_file_cstr` is `nullptr`
.
/// Parses the CLI options `{argc, argv}` and tries to
locate a config file
///
via `config_file_path` and `config_file_path_alternative` unless the user
///
provides a config file path on the command line
.
error
parse
(
int
argc
,
char
**
argv
);
[[
deprecated
(
"set the config_file_path member instead"
)]]
error
...
...
@@ -241,7 +241,7 @@ public:
// -- parsing parameters -----------------------------------------------------
/// Configures
a path for the default
configuration file.
/// Configures
the default path of the
configuration file.
std
::
string
config_file_path
;
/// Configures alternative paths for locating a config file when unable to
...
...
libcaf_core/src/actor_system_config.cpp
View file @
1b5d2e98
...
...
@@ -350,7 +350,7 @@ error actor_system_config::parse(string_list args, std::istream& config) {
error
actor_system_config
::
parse
(
string_list
args
)
{
if
(
auto
&&
[
err
,
path
]
=
extract_config_file_path
(
args
);
!
err
)
{
std
::
ifstream
conf
;
// No error
but an empty path means --config-file=ARG was missing
.
// No error
. An empty path simply means no --config-file=ARG was passed
.
if
(
!
path
.
empty
())
{
conf
.
open
(
path
);
}
else
{
...
...
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