Merge r11462:11485 from jcorgan/omni into trunk.

[debian/gnuradio] / gnuradio-core / src / lib / io / gr_udp_source.cc

diff --git a/gnuradio-core/src/lib/io/gr_udp_source.cc b/gnuradio-core/src/lib/io/gr_udp_source.cc
index 9b6ee6e7d8474a3580de629f1f57dabc735e52d4..d76d0ee32fcd5ef5ab21d2b4a2ab5373d4485f46 100644 (file)
--- a/gnuradio-core/src/lib/io/gr_udp_source.cc
+++ b/gnuradio-core/src/lib/io/gr_udp_source.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -90,7 +90,7 @@ gr_udp_source::~gr_udp_source ()
 bool
 gr_udp_source::open()
 {
-  omni_mutex_lock l(d_mutex);  // hold mutex for duration of this function
+  gruel::scoped_lock guard(d_mutex);   // hold mutex for duration of this function
   // create socket
   d_socket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if(d_socket == -1) {
@@ -137,7 +137,7 @@ gr_udp_source::open()
 void
 gr_udp_source::close()
 {
-  omni_mutex_lock l(d_mutex);  // hold mutex for duration of this function
+  gruel::scoped_lock guard(d_mutex);   // hold mutex for duration of this function
 
   if (d_socket){
     shutdown(d_socket, SHUT_RDWR);