diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-30 12:58:22 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-30 12:58:22 -0700 |
commit | 02b89c6174b776acd2865443fbc19649b8b0e7d0 (patch) | |
tree | 9cc1da754cd7252212fe2d14ac4afe73275f5e38 /gr-trellis/include | |
parent | 5e17e3ea05631c9d1e47ae601859008e9c1f6be9 (diff) |
trellis: moved include dir to gnuradio/trellis
Diffstat (limited to 'gr-trellis/include')
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/CMakeLists.txt (renamed from gr-trellis/include/trellis/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/api.h (renamed from gr-trellis/include/trellis/api.h) | 0 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/base.h (renamed from gr-trellis/include/trellis/base.h) | 0 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/calc_metric.h (renamed from gr-trellis/include/trellis/calc_metric.h) | 0 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h (renamed from gr-trellis/include/trellis/constellation_metrics_cf.h) | 2 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/core_algorithms.h (renamed from gr-trellis/include/trellis/core_algorithms.h) | 4 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/encoder_XX.h.t (renamed from gr-trellis/include/trellis/encoder_XX.h.t) | 4 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/fsm.h (renamed from gr-trellis/include/trellis/fsm.h) | 2 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/interleaver.h (renamed from gr-trellis/include/trellis/interleaver.h) | 2 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/metrics_X.h.t (renamed from gr-trellis/include/trellis/metrics_X.h.t) | 4 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t (renamed from gr-trellis/include/trellis/pccc_decoder_X.h.t) | 8 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t (renamed from gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t) | 10 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t (renamed from gr-trellis/include/trellis/pccc_encoder_XX.h.t) | 6 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/permutation.h (renamed from gr-trellis/include/trellis/permutation.h) | 2 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/quicksort_index.h (renamed from gr-trellis/include/trellis/quicksort_index.h) | 0 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t (renamed from gr-trellis/include/trellis/sccc_decoder_X.h.t) | 8 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t (renamed from gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t) | 10 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t (renamed from gr-trellis/include/trellis/sccc_encoder_XX.h.t) | 6 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/siso_combined_f.h (renamed from gr-trellis/include/trellis/siso_combined_f.h) | 10 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/siso_f.h (renamed from gr-trellis/include/trellis/siso_f.h) | 8 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/siso_type.h (renamed from gr-trellis/include/trellis/siso_type.h) | 0 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/viterbi_X.h.t (renamed from gr-trellis/include/trellis/viterbi_X.h.t) | 6 | ||||
-rw-r--r-- | gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t (renamed from gr-trellis/include/trellis/viterbi_combined_XX.h.t) | 8 |
23 files changed, 50 insertions, 50 deletions
diff --git a/gr-trellis/include/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt index b7ceea179..b7ceea179 100644 --- a/gr-trellis/include/trellis/CMakeLists.txt +++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/gnuradio/trellis/api.h index bdf584286..bdf584286 100644 --- a/gr-trellis/include/trellis/api.h +++ b/gr-trellis/include/gnuradio/trellis/api.h diff --git a/gr-trellis/include/trellis/base.h b/gr-trellis/include/gnuradio/trellis/base.h index c69500d0d..c69500d0d 100644 --- a/gr-trellis/include/trellis/base.h +++ b/gr-trellis/include/gnuradio/trellis/base.h diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/gnuradio/trellis/calc_metric.h index c85fcbff6..c85fcbff6 100644 --- a/gr-trellis/include/trellis/calc_metric.h +++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h index 576378dd6..01bfab014 100644 --- a/gr-trellis/include/trellis/constellation_metrics_cf.h +++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <gnuradio/block.h> #include <gnuradio/digital/constellation.h> #include <gnuradio/digital/metric_type.h> diff --git a/gr-trellis/include/trellis/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h index 03d3efa56..aedff120d 100644 --- a/gr-trellis/include/trellis/core_algorithms.h +++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h @@ -26,8 +26,8 @@ #include <cmath> #include <vector> #include <gnuradio/digital/metric_type.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> namespace gr { namespace trellis { diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t index 390179720..7ece5d3f2 100644 --- a/gr-trellis/include/trellis/encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-trellis/include/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h index d88732b29..cc8893f1e 100644 --- a/gr-trellis/include/trellis/fsm.h +++ b/gr-trellis/include/gnuradio/trellis/fsm.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_FSM_H #define INCLUDED_TRELLIS_FSM_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> #include <iosfwd> diff --git a/gr-trellis/include/trellis/interleaver.h b/gr-trellis/include/gnuradio/trellis/interleaver.h index 35fff0ac8..2147db660 100644 --- a/gr-trellis/include/trellis/interleaver.h +++ b/gr-trellis/include/gnuradio/trellis/interleaver.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_INTERLEAVER_H #define INCLUDED_TRELLIS_INTERLEAVER_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> namespace gr { diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t index d0b8806b6..3f650faf0 100644 --- a/gr-trellis/include/trellis/metrics_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/calc_metric.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/calc_metric.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t index 7f87250be..affce0704 100644 --- a/gr-trellis/include/trellis/pccc_decoder_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t index be9db5a14..719b0aa1e 100644 --- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/calc_metric.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t index c5d4a2f25..5308fe275 100644 --- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> #include <gnuradio/sync_block.h> #include <vector> diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h index 7bac7340d..80b9fef64 100644 --- a/gr-trellis/include/trellis/permutation.h +++ b/gr-trellis/include/gnuradio/trellis/permutation.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_PERMUTATION_H #define INCLUDED_TRELLIS_PERMUTATION_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> #include <gnuradio/sync_block.h> diff --git a/gr-trellis/include/trellis/quicksort_index.h b/gr-trellis/include/gnuradio/trellis/quicksort_index.h index 402962172..402962172 100644 --- a/gr-trellis/include/trellis/quicksort_index.h +++ b/gr-trellis/include/gnuradio/trellis/quicksort_index.h diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t index 1e19bbe95..cc1d86b70 100644 --- a/gr-trellis/include/trellis/sccc_decoder_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t index a7c7c4c72..699de12fd 100644 --- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/calc_metric.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t index 3c1d334d0..85fad02ee 100644 --- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> #include <gnuradio/sync_block.h> #include <vector> diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h index 0997b3fdf..47c34ea81 100644 --- a/gr-trellis/include/trellis/siso_combined_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H #define INCLUDED_TRELLIS_SISO_COMBINED_F_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/calc_metric.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h index 7b5351a83..60c3349e1 100644 --- a/gr-trellis/include/trellis/siso_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_f.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_TRELLIS_SISO_F_H #define INCLUDED_TRELLIS_SISO_F_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/siso_type.h b/gr-trellis/include/gnuradio/trellis/siso_type.h index 916738116..916738116 100644 --- a/gr-trellis/include/trellis/siso_type.h +++ b/gr-trellis/include/gnuradio/trellis/siso_type.h diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t index 574888ec1..2d72cb5e0 100644 --- a/gr-trellis/include/trellis/viterbi_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t index 465b5f518..2becf8bf1 100644 --- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/calc_metric.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { |