diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 17:12:06 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 17:12:06 -0400 |
| commit | 59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb (patch) | |
| tree | 8c399ba425fdf1845e677882d073fbc14d2a8b9d /gr-digital/lib/descrambler_bb_impl.h | |
| parent | 1cd15f64cb2b53219133bcb3821f76ecd2582ff5 (diff) | |
| parent | ac9430cd39bf12395952ca49b1966ec428fdadf3 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/CMakeLists.txt
gr-digital/include/digital_additive_scrambler_bb.h
gr-digital/include/digital_descrambler_bb.h
gr-digital/include/digital_scrambler_bb.h
gr-digital/lib/CMakeLists.txt
Conflicts were for adding dependency on gr-analog.
additive_scrambler_bb_impl, descrambler_bb_impl, and scrambler_bb_impl were update to use LFSR from gr-analog.
Diffstat (limited to 'gr-digital/lib/descrambler_bb_impl.h')
| -rw-r--r-- | gr-digital/lib/descrambler_bb_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-digital/lib/descrambler_bb_impl.h b/gr-digital/lib/descrambler_bb_impl.h index 920182304a..e5ab8b80d5 100644 --- a/gr-digital/lib/descrambler_bb_impl.h +++ b/gr-digital/lib/descrambler_bb_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DESCRAMBLER_BB_IMPL_H #include <digital/descrambler_bb.h> -#include <gri_lfsr.h> +#include <analog/lfsr.h> namespace gr { namespace digital { @@ -32,7 +32,7 @@ namespace gr { class descrambler_bb_impl : public descrambler_bb { private: - gri_lfsr d_lfsr; + analog::lfsr d_lfsr; public: descrambler_bb_impl(int mask, int seed, int len); |