diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-blocks/lib/file_meta_source_impl.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/file_meta_source_impl.h')
| -rw-r--r-- | gr-blocks/lib/file_meta_source_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h index ca7ddc6e10..3f8ebda6ee 100644 --- a/gr-blocks/lib/file_meta_source_impl.h +++ b/gr-blocks/lib/file_meta_source_impl.h @@ -25,8 +25,8 @@ #include <blocks/file_meta_source.h> #include <gr_tags.h> -#include <gruel/pmt.h> -#include <gruel/thread.h> +#include <pmt/pmt.h> +#include <thread/thread.h> #include <blocks/file_meta_sink.h> @@ -50,7 +50,7 @@ namespace gr { bool d_updated; bool d_repeat; - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; FILE *d_new_fp, *d_new_hdr_fp; FILE *d_fp, *d_hdr_fp; meta_state_t d_state; |