summaryrefslogtreecommitdiff
path: root/gr-trellis/include/trellis
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-04-17 13:43:52 -0400
committerTom Rondeau <trondeau@vt.edu>2013-04-29 14:52:56 -0400
commitf3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch)
tree140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-trellis/include/trellis
parent35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff)
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-trellis/include/trellis')
-rw-r--r--gr-trellis/include/trellis/api.h2
-rw-r--r--gr-trellis/include/trellis/calc_metric.h2
-rw-r--r--gr-trellis/include/trellis/constellation_metrics_cf.h4
-rw-r--r--gr-trellis/include/trellis/encoder_XX.h.t4
-rw-r--r--gr-trellis/include/trellis/metrics_X.h.t4
-rw-r--r--gr-trellis/include/trellis/pccc_decoder_X.h.t4
-rw-r--r--gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t4
-rw-r--r--gr-trellis/include/trellis/pccc_encoder_XX.h.t4
-rw-r--r--gr-trellis/include/trellis/permutation.h4
-rw-r--r--gr-trellis/include/trellis/sccc_decoder_X.h.t4
-rw-r--r--gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t4
-rw-r--r--gr-trellis/include/trellis/sccc_encoder_XX.h.t4
-rw-r--r--gr-trellis/include/trellis/siso_combined_f.h4
-rw-r--r--gr-trellis/include/trellis/siso_f.h4
-rw-r--r--gr-trellis/include/trellis/viterbi_X.h.t4
-rw-r--r--gr-trellis/include/trellis/viterbi_combined_XX.h.t4
16 files changed, 30 insertions, 30 deletions
diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/trellis/api.h
index 8b85addd96..bdf5842864 100644
--- a/gr-trellis/include/trellis/api.h
+++ b/gr-trellis/include/trellis/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_TRELLIS_API_H
#define INCLUDED_TRELLIS_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_trellis_EXPORTS
# define TRELLIS_API __GR_ATTR_EXPORT
diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/trellis/calc_metric.h
index b39267dc84..46d83c301f 100644
--- a/gr-trellis/include/trellis/calc_metric.h
+++ b/gr-trellis/include/trellis/calc_metric.h
@@ -24,7 +24,7 @@
#define INCLUDED_CALC_METRIC_H
#include <vector>
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
#include <digital/metric_type.h>
namespace gr {
diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/trellis/constellation_metrics_cf.h
index f4b94223c7..5a728ad96c 100644
--- a/gr-trellis/include/trellis/constellation_metrics_cf.h
+++ b/gr-trellis/include/trellis/constellation_metrics_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
#include <trellis/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <digital/constellation.h>
#include <digital/metric_type.h>
@@ -35,7 +35,7 @@ namespace gr {
* \brief Evaluate metrics for use by the Viterbi algorithm.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API constellation_metrics_cf : virtual public gr_block
+ class TRELLIS_API constellation_metrics_cf : virtual public block
{
public:
// gr::trellis::constellation_metrics_cf::sptr
diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/trellis/encoder_XX.h.t
index 9ca7cb30ce..3901797204 100644
--- a/gr-trellis/include/trellis/encoder_XX.h.t
+++ b/gr-trellis/include/trellis/encoder_XX.h.t
@@ -27,7 +27,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
* \brief Convolutional encoder.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_sync_block
+ class TRELLIS_API @NAME@ : virtual public sync_block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/trellis/metrics_X.h.t
index dab7924a8b..d0b8806b62 100644
--- a/gr-trellis/include/trellis/metrics_X.h.t
+++ b/gr-trellis/include/trellis/metrics_X.h.t
@@ -27,7 +27,7 @@
#include <trellis/api.h>
#include <trellis/calc_metric.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
* \brief Evaluate metrics for use by the Viterbi algorithm.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/trellis/pccc_decoder_X.h.t
index d5b6af7b87..7f87250bec 100644
--- a/gr-trellis/include/trellis/pccc_decoder_X.h.t
+++ b/gr-trellis/include/trellis/pccc_decoder_X.h.t
@@ -29,7 +29,7 @@
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t b/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
index 87b110a945..be9db5a146 100644
--- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
+++ b/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
@@ -30,7 +30,7 @@
#include <trellis/interleaver.h>
#include <trellis/calc_metric.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -39,7 +39,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/trellis/pccc_encoder_XX.h.t
index 2a62b7520f..c5d4a2f253 100644
--- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t
+++ b/gr-trellis/include/trellis/pccc_encoder_XX.h.t
@@ -28,7 +28,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
* \brief PCCC encoder.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_sync_block
+ class TRELLIS_API @NAME@ : virtual public sync_block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/trellis/permutation.h
index 0f974abb97..7bac7340d9 100644
--- a/gr-trellis/include/trellis/permutation.h
+++ b/gr-trellis/include/trellis/permutation.h
@@ -25,7 +25,7 @@
#include <trellis/api.h>
#include <vector>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace trellis {
@@ -34,7 +34,7 @@ namespace gr {
* \brief Permutation.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API permutation : virtual public gr_sync_block
+ class TRELLIS_API permutation : virtual public sync_block
{
public:
// gr::trellis::permutation::sptr
diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/trellis/sccc_decoder_X.h.t
index 1a63facad9..1e19bbe950 100644
--- a/gr-trellis/include/trellis/sccc_decoder_X.h.t
+++ b/gr-trellis/include/trellis/sccc_decoder_X.h.t
@@ -29,7 +29,7 @@
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t b/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
index f5f9bef464..a7c7c4c723 100644
--- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
@@ -30,7 +30,7 @@
#include <trellis/interleaver.h>
#include <trellis/calc_metric.h>
#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
#include <vector>
namespace gr {
@@ -39,7 +39,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/trellis/sccc_encoder_XX.h.t
index f62a1e7cfb..3c1d334d08 100644
--- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t
+++ b/gr-trellis/include/trellis/sccc_encoder_XX.h.t
@@ -28,7 +28,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
#include <trellis/interleaver.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
#include <vector>
namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
* \brief SCCC encoder.
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_sync_block
+ class TRELLIS_API @NAME@ : virtual public sync_block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/trellis/siso_combined_f.h
index 48089f86e4..0997b3fdfa 100644
--- a/gr-trellis/include/trellis/siso_combined_f.h
+++ b/gr-trellis/include/trellis/siso_combined_f.h
@@ -28,7 +28,7 @@
#include <trellis/siso_type.h>
#include <trellis/calc_metric.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API siso_combined_f : virtual public gr_block
+ class TRELLIS_API siso_combined_f : virtual public block
{
public:
// gr::trellis::siso_combined_f::sptr
diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/trellis/siso_f.h
index 6d4d414f38..7b5351a838 100644
--- a/gr-trellis/include/trellis/siso_f.h
+++ b/gr-trellis/include/trellis/siso_f.h
@@ -27,7 +27,7 @@
#include <trellis/fsm.h>
#include <trellis/siso_type.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -35,7 +35,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API siso_f : virtual public gr_block
+ class TRELLIS_API siso_f : virtual public block
{
public:
// gr::trellis::siso_f::sptr
diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/trellis/viterbi_X.h.t
index 817c98508a..574888ec12 100644
--- a/gr-trellis/include/trellis/viterbi_X.h.t
+++ b/gr-trellis/include/trellis/viterbi_X.h.t
@@ -28,7 +28,7 @@
#include <trellis/api.h>
#include <trellis/fsm.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/trellis/viterbi_combined_XX.h.t
index a2cc4b946c..465b5f518f 100644
--- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t
+++ b/gr-trellis/include/trellis/viterbi_combined_XX.h.t
@@ -29,7 +29,7 @@
#include <trellis/fsm.h>
#include <trellis/calc_metric.h>
#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace trellis {
@@ -37,7 +37,7 @@ namespace gr {
/*!
* \ingroup trellis_coding_blk
*/
- class TRELLIS_API @NAME@ : virtual public gr_block
+ class TRELLIS_API @NAME@ : virtual public block
{
public:
// gr::trellis::@BASE_NAME@::sptr
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-19 03:35:25 +0000