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_sink_impl.h | |
| 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_sink_impl.h')
| -rw-r--r-- | gr-blocks/lib/udp_sink_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-blocks/lib/udp_sink_impl.h b/gr-blocks/lib/udp_sink_impl.h index 243d499b60..0f0d081422 100644 --- a/gr-blocks/lib/udp_sink_impl.h +++ b/gr-blocks/lib/udp_sink_impl.h @@ -37,7 +37,7 @@ namespace gr { int d_payload_size; // maximum transmission unit (packet length) bool d_eof; // send zero-length packet on disconnect bool d_connected; // are we connected? - gruel::mutex d_mutex; // protects d_socket and d_connected + gr::thread::mutex d_mutex; // protects d_socket and d_connected boost::asio::ip::udp::socket *d_socket; // handle to socket boost::asio::ip::udp::endpoint d_endpoint; |