diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-blocks/lib/udp_source_impl.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/udp_source_impl.cc')
| -rw-r--r-- | gr-blocks/lib/udp_source_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index e6e9caf8ad..5b108c393e 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -100,7 +100,7 @@ namespace gr { d_socket->bind(d_endpoint); start_receive(); - d_udp_thread = gruel::thread(boost::bind(&udp_source_impl::run_io_service, this)); + d_udp_thread = gr::thread::thread(boost::bind(&udp_source_impl::run_io_service, this)); d_connected = true; } } @@ -108,7 +108,7 @@ namespace gr { void udp_source_impl::disconnect() { - gruel::scoped_lock lock(d_setlock); + gr::thread::scoped_lock lock(d_setlock); if(!d_connected) return; @@ -144,7 +144,7 @@ namespace gr { { if(!error) { { - boost::lock_guard<gruel::mutex> lock(d_udp_mutex); + boost::lock_guard<gr::thread::mutex> lock(d_udp_mutex); if(d_eof && (bytes_transferred == 1) && (d_rxbuf[0] == 0x00)) { // If we are using EOF notification, test for it and don't // add anything to the output. @@ -177,7 +177,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); char *out = (char*)output_items[0]; |