diff options
| author | Johnathan Corgan | 2011-03-14 19:52:00 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-03-14 19:52:00 -0700 |
| commit | 90243cbeca81a47da7760247787546ac4ed722cb (patch) | |
| tree | cb13f8b9b58f1d49a8f1285c63ce0002048734ad /gnuradio-core/src | |
| parent | a12b611f1fb5e409cefd311aa2537168e65d6f46 (diff) | |
| parent | e73c25fb9226029f0e50052b1ffacedb3a78622b (diff) | |
| download | gnuradio-90243cbeca81a47da7760247787546ac4ed722cb.tar.gz gnuradio-90243cbeca81a47da7760247787546ac4ed722cb.tar.bz2 gnuradio-90243cbeca81a47da7760247787546ac4ed722cb.zip | |
Merge remote branch 'jblum/mergeme/misc/gruel_thread_simplification' into next
* jblum/mergeme/misc/gruel_thread_simplification:
gruel thread simplification:
Diffstat (limited to 'gnuradio-core/src')
| -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; |