diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-12-13 14:15:37 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-12-13 14:15:37 -0800 |
| commit | 7ad9000642693deb1e18507fb9b0951c3849d17d (patch) | |
| tree | 79c855728fc6c3ce408f72bd5638ebcc87833be6 | |
| parent | e1ad418028e103283775780663d078415590be31 (diff) | |
| parent | 543f8390edcab0201a68fabe86803b0d6f63ee34 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc b/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc index 877e240c29..1d0c66fb8f 100644 --- a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc +++ b/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc @@ -318,13 +318,14 @@ gr_hier_block2_detail::resolve_port(int port, bool is_input) if (is_input) { if (port < 0 || port >= (signed)d_inputs.size()) { - msg << "resolve_port: input " << port << " is out of range"; + msg << "resolve_port: hierarchical block '" << d_owner->name() + << "': input " << port << " is out of range"; throw std::runtime_error(msg.str()); } if (d_inputs[port].empty()) { - msg << "hierarchical block '" << d_owner->name() << "' input " << port - << " is not connected internally"; + msg << "resolve_port: hierarchical block '" << d_owner->name() + << "': input " << port << " is not connected internally"; throw std::runtime_error(msg.str()); } @@ -337,13 +338,14 @@ gr_hier_block2_detail::resolve_port(int port, bool is_input) } else { if (port < 0 || port >= (signed)d_outputs.size()) { - msg << "resolve_port: output " << port << " is out of range"; + msg << "resolve_port: hierarchical block '" << d_owner->name() + << "': output " << port << " is out of range"; throw std::runtime_error(msg.str()); } if (d_outputs[port] == gr_endpoint()) { - msg << "hierarchical block '" << d_owner->name() << "' output " << port - << " is not connected internally"; + msg << "resolve_port: hierarchical block '" << d_owner->name() + << "': output " << port << " is not connected internally"; throw std::runtime_error(msg.str()); } @@ -351,7 +353,8 @@ gr_hier_block2_detail::resolve_port(int port, bool is_input) } if (result.empty()) { - msg << "unable to resolve " + msg << "resolve_port: hierarchical block '" << d_owner->name() + << "': unable to resolve " << (is_input ? "input port " : "output port ") << port; throw std::runtime_error(msg.str()); |