diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-blocks/lib/message_source_impl.cc | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-blocks/lib/message_source_impl.cc')
| -rw-r--r-- | gr-blocks/lib/message_source_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-blocks/lib/message_source_impl.cc b/gr-blocks/lib/message_source_impl.cc index 05ec2f248b..b4e9ba6ed7 100644 --- a/gr-blocks/lib/message_source_impl.cc +++ b/gr-blocks/lib/message_source_impl.cc @@ -117,7 +117,7 @@ namespace gr { out += mm * d_itemsize; d_msg_offset += mm * d_itemsize; assert(d_msg_offset <= d_msg->length()); - + if (d_msg_offset == d_msg->length()){ if (d_msg->type() == 1) // type == 1 sets EOF d_eof = true; @@ -131,17 +131,17 @@ namespace gr { if (d_msgq->empty_p() && nn > 0){ // no more messages in the queue, return what we've got break; } - + if (d_eof) return -1; - + d_msg = d_msgq->delete_head(); // block, waiting for a message d_msg_offset = 0; - + if ((d_msg->length() % d_itemsize) != 0) throw std::runtime_error("msg length is not a multiple of d_itemsize"); } - + } return nn; |