diff options
| author | Johnathan Corgan | 2012-10-13 11:55:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-10-13 11:55:40 -0700 |
| commit | 136050324a6f5023a6b549b158fef1a0de9e1d79 (patch) | |
| tree | 731b378fc1220b81b912e073f35917dc971045c0 /gnuradio-core/src | |
| parent | 2267dee5f36f28004cf844a5e495194edb00a67b (diff) | |
| parent | 5b97216d8d62580b4c9224fb2ad630ade61c0a4f (diff) | |
| download | gnuradio-136050324a6f5023a6b549b158fef1a0de9e1d79.tar.gz gnuradio-136050324a6f5023a6b549b158fef1a0de9e1d79.tar.bz2 gnuradio-136050324a6f5023a6b549b158fef1a0de9e1d79.zip | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_annotator_raw.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_annotator_raw.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/qa_block_tags.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/gr_annotator_raw.h b/gnuradio-core/src/lib/general/gr_annotator_raw.h index 8a6c3f6c0..02d061908 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_raw.h +++ b/gnuradio-core/src/lib/general/gr_annotator_raw.h @@ -25,7 +25,7 @@ #include <gr_core_api.h> #include <gr_sync_block.h> -#include <gruel/pmt.h> +#include <gr_tags.h> #include <gruel/thread.h> class gr_annotator_raw; diff --git a/gnuradio-core/src/lib/general/gr_annotator_raw.i b/gnuradio-core/src/lib/general/gr_annotator_raw.i index 85777ef5d..4a58fe7c7 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_raw.i +++ b/gnuradio-core/src/lib/general/gr_annotator_raw.i @@ -22,5 +22,5 @@ GR_SWIG_BLOCK_MAGIC(gr,annotator_raw); -%include <pmt_swig.i> +%include <gr_tags.i> %include <gr_annotator_raw.h> diff --git a/gnuradio-core/src/lib/runtime/qa_block_tags.cc b/gnuradio-core/src/lib/runtime/qa_block_tags.cc index 4fa0a0323..d6b1065e3 100644 --- a/gnuradio-core/src/lib/runtime/qa_block_tags.cc +++ b/gnuradio-core/src/lib/runtime/qa_block_tags.cc @@ -33,7 +33,7 @@ #include <gr_annotator_1to1.h> #include <gr_keep_one_in_n.h> #include <gr_firdes.h> -#include <gruel/pmt.h> +#include <gr_tags.h> // ---------------------------------------------------------------- |