Skip to content
Snippets Groups Projects

Follow change in allen() signature

Merged Roel Aaij requested to merge input_provider_bare_pointer into master
Files
11
@@ -186,15 +186,12 @@ int AllenApplication::configureApplication() {
}
}
auto* provider = dynamic_cast<IInputProvider*>( mepProvider.get() );
if ( provider == nullptr ) {
m_provider = dynamic_cast<IInputProvider*>( mepProvider.get() );
if ( m_provider == nullptr ) {
m_logger->error( "Failed to cast MEPProvider" );
return Online::ONLINE_ERROR;
}
// Use a deleter that does nothing to allow wrapping it in a shared pointer.
m_provider.reset( provider, []( IInputProvider* ) {} );
std::string const& sequence = m_allenConfig->sequence();
if ( sequence.empty() ) {
m_logger->error( "Failed to obtain sequence" );
@@ -346,7 +343,7 @@ OutputHandler* AllenApplication::makeOutput() {
if ( output_type == "file" || output_type == "tcp" ) {
auto options = m_options;
options["output-file"] = connection;
m_outputHolder = Allen::output_handler( m_provider.get(), m_zmqSvc.get(), std::move( options ) );
m_outputHolder = Allen::output_handler( m_provider, m_zmqSvc.get(), std::move( options ) );
return m_outputHolder.get();
} else if ( output_type == "mbm" ) {
SmartIF<ISvcLocator> sloc = app.as<ISvcLocator>();
Loading