diff options
| author | Josh Blum | 2012-10-27 19:36:47 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-10-27 19:36:47 -0700 |
| commit | cd42f1c9d373639880503ee97c041d1f0dcd974f (patch) | |
| tree | c507f7db4e077d6d7c741ca3238e6c8f0dc87f63 /include/gnuradio | |
| parent | 2a1966462484cf1cb25ea7802cc0d9a8e80096c9 (diff) | |
| download | sandhi-cd42f1c9d373639880503ee97c041d1f0dcd974f.tar.gz sandhi-cd42f1c9d373639880503ee97c041d1f0dcd974f.tar.bz2 sandhi-cd42f1c9d373639880503ee97c041d1f0dcd974f.zip | |
added support for the real PMC type (stub removed)
need to create conversions still...
Diffstat (limited to 'include/gnuradio')
| -rw-r--r-- | include/gnuradio/gr_tags.h | 3 | ||||
| -rw-r--r-- | include/gnuradio/tags.hpp | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/gnuradio/gr_tags.h b/include/gnuradio/gr_tags.h index cb268da..ca45170 100644 --- a/include/gnuradio/gr_tags.h +++ b/include/gnuradio/gr_tags.h @@ -17,7 +17,8 @@ #ifndef INCLUDED_GR_TAGS_H #define INCLUDED_GR_TAGS_H -#include <gnuradio/tags.hpp> +#include <gnuradio/gras.hpp> +#include <gruel/pmt.h> struct GRAS_API gr_tag_t { diff --git a/include/gnuradio/tags.hpp b/include/gnuradio/tags.hpp index c8eafba..bc83709 100644 --- a/include/gnuradio/tags.hpp +++ b/include/gnuradio/tags.hpp @@ -19,11 +19,8 @@ #include <gnuradio/gras.hpp> #include <boost/operators.hpp> - -//TODO -- this is a stub for the PMC libray -#include <gruel/pmt.h> -typedef pmt::pmt_t PMC; -typedef pmt::pmt_t PMCC; +#include <PMC/PMC.hpp> +#include <boost/cstdint.hpp> namespace gnuradio { @@ -37,7 +34,7 @@ struct GRAS_API Tag : boost::less_than_comparable<Tag> Tag(const uint64_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid = PMCC()); //! the absolute item count associated with this tag - uint64_t offset; + boost::uint64_t offset; //! A symbolic name identifying the type of tag PMCC key; |