diff options
| author | Josh Blum | 2010-04-14 11:06:07 -0700 |
|---|---|---|
| committer | Josh Blum | 2010-04-14 11:06:07 -0700 |
| commit | 7dadb34647bddee0cbb36771370ea2318495e68d (patch) | |
| tree | d4e9149b18e638aaaf36a8a8f5f7f74daaec456e /usrp2/host/lib/ring.h | |
| parent | 5d7b2c44396ef6991b049d2d15ebf5b822690961 (diff) | |
| parent | ad973608d979675755cb537f14ae0a53f71e6489 (diff) | |
| download | gnuradio-7dadb34647bddee0cbb36771370ea2318495e68d.tar.gz gnuradio-7dadb34647bddee0cbb36771370ea2318495e68d.tar.bz2 gnuradio-7dadb34647bddee0cbb36771370ea2318495e68d.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into uhd
Diffstat (limited to 'usrp2/host/lib/ring.h')
| -rw-r--r-- | usrp2/host/lib/ring.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usrp2/host/lib/ring.h b/usrp2/host/lib/ring.h index 19ae9ae97..fd0ad0a9f 100644 --- a/usrp2/host/lib/ring.h +++ b/usrp2/host/lib/ring.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,10 +21,10 @@ #ifndef INCLUDED_RING_H #define INCLUDED_RING_H -#include <gnuradio/omnithread.h> #include <stddef.h> #include <vector> #include <boost/shared_ptr.hpp> +#include <gruel/thread.h> namespace usrp2 { @@ -46,8 +46,8 @@ namespace usrp2 { }; std::vector<ring_desc> d_ring; - omni_mutex d_mutex; - omni_condition d_not_empty; + gruel::mutex d_mutex; + gruel::condition_variable d_not_empty; void inc_read_ind() { |