diff options
| author | Josh Blum | 2011-01-24 00:34:28 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-02-27 19:58:32 -0800 |
| commit | e73c25fb9226029f0e50052b1ffacedb3a78622b (patch) | |
| tree | b480f83b5b614f67b4c544f955fb85b3c338762e /gnuradio-core/src/lib/runtime | |
| parent | a02bb131f68d5aa66093310c393562671e389778 (diff) | |
| download | gnuradio-e73c25fb9226029f0e50052b1ffacedb3a78622b.tar.gz gnuradio-e73c25fb9226029f0e50052b1ffacedb3a78622b.tar.bz2 gnuradio-e73c25fb9226029f0e50052b1ffacedb3a78622b.zip | |
gruel thread simplification:
Removed get_new_timeout from thread.h (usrp2_vrt carryover) Basically it was created because of a misunderstanding of the time types; and its only ever called once. This also removes thread.cc
Call posix_time::milliseconds in usrp2 control.cc. Notice that it passes a time_duration rather than a ptime (aka system time).
Added #include <deque> to gr_buffer.h. It turns out that boost posix_time.hpp implicitly included the deque header which was missing from gr_buffer.h
Replaced the include for thread.hpp with only the includes for the boost thread types mentioned in gruel/thread.h. Also, making use of the scoped_lock typedef that comes with boost thread locks. boost 3.5 safe.
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_buffer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.h b/gnuradio-core/src/lib/runtime/gr_buffer.h index aa26f1e09..e5725d386 100644 --- a/gnuradio-core/src/lib/runtime/gr_buffer.h +++ b/gnuradio-core/src/lib/runtime/gr_buffer.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2009,2010 Free Software Foundation, Inc. + * Copyright 2004,2009,2010,2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,6 +27,7 @@ #include <boost/weak_ptr.hpp> #include <gruel/thread.h> #include <gruel/pmt.h> +#include <deque> class gr_vmcircbuf; |