diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-05-29 22:34:40 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-05-29 22:34:40 +0200 |
| commit | 3e6a24e5d9e81878ac57281e7a9d3b23d3dbc6e8 (patch) | |
| tree | 0c019966642fb57a39bc0e4b618b7477c6d0c955 /include | |
| parent | 9912dcd1e6686f7111549e50333148fde630949a (diff) | |
convert to gnuradio 3.7 interface
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmosdr/osmosdr_api.h | 2 | ||||
| -rw-r--r-- | include/osmosdr/osmosdr_sink_c.h | 8 | ||||
| -rw-r--r-- | include/osmosdr/osmosdr_source_c.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/osmosdr/osmosdr_api.h b/include/osmosdr/osmosdr_api.h index d8a1c4c..d3adbf0 100644 --- a/include/osmosdr/osmosdr_api.h +++ b/include/osmosdr/osmosdr_api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_OSMOSDR_API_H #define INCLUDED_OSMOSDR_API_H -#include <gruel/attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_osmosdr_EXPORTS # define OSMOSDR_API __GR_ATTR_EXPORT diff --git a/include/osmosdr/osmosdr_sink_c.h b/include/osmosdr/osmosdr_sink_c.h index d3911e1..fa03300 100644 --- a/include/osmosdr/osmosdr_sink_c.h +++ b/include/osmosdr/osmosdr_sink_c.h @@ -22,13 +22,13 @@ #include <osmosdr/osmosdr_api.h> #include <osmosdr/osmosdr_ranges.h> -#include <gnuradio/gr_hier_block2.h> +#include <gnuradio/hier_block2.h> class osmosdr_sink_c; /* * We use boost::shared_ptr's instead of raw pointers for all access - * to gr_blocks (and many other data structures). The shared_ptr gets + * to gr::blocks (and many other data structures). The shared_ptr gets * us transparent reference counting, which greatly simplifies storage * management issues. This is especially helpful in our hybrid * C++ / Python system. @@ -52,9 +52,9 @@ OSMOSDR_API osmosdr_sink_c_sptr osmosdr_make_sink_c ( const std::string & args = * \brief Takes a stream of complex samples. * \ingroup block * - * This uses the preferred technique: subclassing gr_hier_block2. + * This uses the preferred technique: subclassing gr::hier_block2. */ -class OSMOSDR_API osmosdr_sink_c : virtual public gr_hier_block2 +class OSMOSDR_API osmosdr_sink_c : virtual public gr::hier_block2 { public: /*! diff --git a/include/osmosdr/osmosdr_source_c.h b/include/osmosdr/osmosdr_source_c.h index 8ffdb90..9b506df 100644 --- a/include/osmosdr/osmosdr_source_c.h +++ b/include/osmosdr/osmosdr_source_c.h @@ -22,13 +22,13 @@ #include <osmosdr/osmosdr_api.h> #include <osmosdr/osmosdr_ranges.h> -#include <gnuradio/gr_hier_block2.h> +#include <gnuradio/hier_block2.h> class osmosdr_source_c; /* * We use boost::shared_ptr's instead of raw pointers for all access - * to gr_blocks (and many other data structures). The shared_ptr gets + * to gr::blocks (and many other data structures). The shared_ptr gets * us transparent reference counting, which greatly simplifies storage * management issues. This is especially helpful in our hybrid * C++ / Python system. @@ -52,9 +52,9 @@ OSMOSDR_API osmosdr_source_c_sptr osmosdr_make_source_c ( const std::string & ar * \brief Provides a stream of complex samples. * \ingroup block * - * This uses the preferred technique: subclassing gr_hier_block2. + * This uses the preferred technique: subclassing gr::hier_block2. */ -class OSMOSDR_API osmosdr_source_c : virtual public gr_hier_block2 +class OSMOSDR_API osmosdr_source_c : virtual public gr::hier_block2 { public: /*! |