|
8 | 8 | #include "InputStreamManager.h" |
9 | 9 | #include "Policies.h" |
10 | 10 | #include "Taps.h" |
| 11 | +#include "CorradeCompat.h" |
11 | 12 | #include <Corrade/Utility/ConfigurationGroup.h> |
12 | 13 | #include <spdlog/sinks/stdout_color_sinks.h> |
13 | 14 | #include <spdlog/spdlog.h> |
@@ -62,7 +63,7 @@ void CoreRegistry::start(HttpServer *svr) |
62 | 63 | InputPluginPtr mod = _input_registry.instantiate(alias); |
63 | 64 | _logger->info("Load input stream plugin: {} version {} interface {}", alias, version, mod->pluginInterface()); |
64 | 65 | mod->init_plugin(this, svr, &geo::GeoIP(), &geo::GeoASN()); |
65 | | - auto result = _input_plugins.insert({std::make_pair(alias, version), std::move(mod)}); |
| 66 | + auto result = _input_plugins.insert({std::make_pair(corrade_to_std_string(alias), version), std::move(mod)}); |
66 | 67 | if (!result.second) { |
67 | 68 | throw std::runtime_error(fmt::format("Input alias '{}' with version '{}' was already loaded.", alias, version)); |
68 | 69 | } |
@@ -92,7 +93,7 @@ void CoreRegistry::start(HttpServer *svr) |
92 | 93 | HandlerPluginPtr mod = _handler_registry.instantiate(s); |
93 | 94 | _logger->info("Load stream handler plugin: {} version {} interface {}", alias, version, mod->pluginInterface()); |
94 | 95 | mod->init_plugin(this, svr, &geo::GeoIP(), &geo::GeoASN()); |
95 | | - auto result = _handler_plugins.insert({std::make_pair(alias, version), std::move(mod)}); |
| 96 | + auto result = _handler_plugins.insert({std::make_pair(corrade_to_std_string(alias), version), std::move(mod)}); |
96 | 97 | if (!result.second) { |
97 | 98 | throw std::runtime_error(fmt::format("Handler alias '{}' with version '{}' was already loaded.", alias, version)); |
98 | 99 | } |
|
0 commit comments