Merge r11462:11485 from jcorgan/omni into trunk.

Removes dependency on omnithreads from gnuradio-core.

Trunk passes distcheck.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11486 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 4 insertions, 4 deletions

diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.cc b/gnuradio-core/src/lib/runtime/gr_buffer.cc
index 31a471ea7..db2db5d6d 100644
--- a/gnuradio-core/src/lib/runtime/gr_buffer.cc
+++ b/gnuradio-core/src/lib/runtime/gr_buffer.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -175,14 +175,14 @@ gr_buffer::write_pointer ()
 void
 gr_buffer::update_write_pointer (int nitems)
 {
-  scoped_lock	guard(*mutex());
+  gruel::scoped_lock guard(*mutex());
   d_write_index = index_add (d_write_index, nitems);
 }
 
 void
 gr_buffer::set_done (bool done)
 {
-  scoped_lock	guard(*mutex());
+  gruel::scoped_lock guard(*mutex());
   d_done = done;
 }
 
@@ -251,7 +251,7 @@ gr_buffer_reader::read_pointer ()
 void
 gr_buffer_reader::update_read_pointer (int nitems)
 {
-  scoped_lock	guard(*mutex());
+  gruel::scoped_lock guard(*mutex());
   d_read_index = d_buffer->index_add (d_read_index, nitems);
 }