diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
| commit | 09d8b895447b1507b80a27053b51361ea1684175 (patch) | |
| tree | 93edf8d2ebedb3ffcf02edd79b16516c6333f0fb /gnuradio-runtime/lib/tpb_thread_body.cc | |
| parent | 090103c760a308101e2cbf3630f6bf46a2bb4d8e (diff) | |
| parent | 7a1403796abd4f9df1483482ce06b169a3212be8 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
Diffstat (limited to 'gnuradio-runtime/lib/tpb_thread_body.cc')
| -rw-r--r-- | gnuradio-runtime/lib/tpb_thread_body.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc index e3f57eef53..93591feee2 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.cc +++ b/gnuradio-runtime/lib/tpb_thread_body.cc @@ -152,7 +152,7 @@ namespace gr { while(!d->d_tpb.input_changed && block->empty_handled_p()){ boost::system_time const timeout=boost::get_system_time()+ boost::posix_time::milliseconds(250); if(!d->d_tpb.input_cond.timed_wait(guard, timeout)){ - goto tpb_loop_top; // timeout occured (perform sanity checks up top) + goto tpb_loop_top; // timeout occurred (perform sanity checks up top) } } |