Commit 73110541 authored by Dominik Charousset's avatar Dominik Charousset

Fix default config file name when using CAF_MAIN

parent ca3686a7
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file. The format All notable changes to this project will be documented in this file. The format
is based on [Keep a Changelog](https://keepachangelog.com). is based on [Keep a Changelog](https://keepachangelog.com).
## [Unreleased]
### Changed
- When using `CAF_MAIN`, CAF now looks for the correct default config file name,
i.e., `caf-application.conf`.
## [0.18.0-rc.1] - 2020-09-09 ## [0.18.0-rc.1] - 2020-09-09
### Added ### Added
...@@ -519,6 +526,7 @@ is based on [Keep a Changelog](https://keepachangelog.com). ...@@ -519,6 +526,7 @@ is based on [Keep a Changelog](https://keepachangelog.com).
- Setting the log level to `quiet` now properly suppresses any log output. - Setting the log level to `quiet` now properly suppresses any log output.
- Configuring colored terminal output should now print colored output. - Configuring colored terminal output should now print colored output.
[Unreleased]: https://github.com/actor-framework/actor-framework/compare/0.18.0-rc.1...master
[0.18.0-rc.1]: https://github.com/actor-framework/actor-framework/releases/0.18.0-rc.1 [0.18.0-rc.1]: https://github.com/actor-framework/actor-framework/releases/0.18.0-rc.1
[0.17.7]: https://github.com/actor-framework/actor-framework/compare/0.17.6...release/0.17 [0.17.7]: https://github.com/actor-framework/actor-framework/compare/0.17.6...release/0.17
[0.17.6]: https://github.com/actor-framework/actor-framework/releases/0.17.6 [0.17.6]: https://github.com/actor-framework/actor-framework/releases/0.17.6
......
...@@ -70,7 +70,7 @@ void exec_main_load_module(actor_system_config& cfg) { ...@@ -70,7 +70,7 @@ void exec_main_load_module(actor_system_config& cfg) {
template <class... Ts, class F = void (*)(actor_system&)> template <class... Ts, class F = void (*)(actor_system&)>
int exec_main(F fun, int argc, char** argv, int exec_main(F fun, int argc, char** argv,
const char* config_file_name = "caf-application.ini") { const char* config_file_name = "caf-application.conf") {
using trait = typename detail::get_callable_trait<F>::type; using trait = typename detail::get_callable_trait<F>::type;
using arg_types = typename trait::arg_types; using arg_types = typename trait::arg_types;
static_assert(detail::tl_size<arg_types>::value == 1 static_assert(detail::tl_size<arg_types>::value == 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment