argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

don't throw exceptions inside a gr_hier_block2 ctor 

This avoids throws in ctor of gr_hier_block2, as gnuradio is unable to
deal with this behavior in a clean way. The GR maintainer Rondeau has
been informed.
This commit is contained in:
Dimitri Stolnikov 2012-09-30 16:54:34 +02:00
parent 0f25daec61
commit c51b04ee74
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/osmosdr_source_c_impl.cc
View File

@ -56,6 +56,10 @@
#include <osmosdr_arg_helpers.h>
/* This avoids throws in ctor of gr_hier_block2, as gnuradio is unable to deal
with this behavior in a clean way. The GR maintainer Rondeau has been informed. */
#define WORKAROUND_GR_HIER_BLOCK2_BUG
/*
* Create a new instance of osmosdr_source_c_impl and return
* a boost shared_ptr. This is effectively the public constructor.
@ -110,7 +114,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args)
}
}
}
#ifdef WORKAROUND_GR_HIER_BLOCK2_BUG
try {
#endif
std::vector< std::string > dev_list;
#ifdef ENABLE_OSMOSDR
BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() )
@ -204,6 +210,11 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args)
if (!_devs.size())
throw std::runtime_error("No devices specified via device arguments.");
#ifdef WORKAROUND_GR_HIER_BLOCK2_BUG
} catch ( std::exception &ex ) {
std::cerr << std::endl << "FATAL: " << ex.what() << std::endl << std::endl;
}
#endif
}
size_t osmosdr_source_c_impl::get_num_channels()