diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-fec | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-fec')
| -rw-r--r-- | gr-fec/doc/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-fec/doc/README.fec | 2 | ||||
| -rw-r--r-- | gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h | 4 | ||||
| -rw-r--r-- | gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/gr-fec/doc/CMakeLists.txt b/gr-fec/doc/CMakeLists.txt index 776f1e2159..35aebb2e01 100644 --- a/gr-fec/doc/CMakeLists.txt +++ b/gr-fec/doc/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-fec/doc/README.fec b/gr-fec/doc/README.fec index 02374bca84..346cc8f1da 100644 --- a/gr-fec/doc/README.fec +++ b/gr-fec/doc/README.fec @@ -7,6 +7,6 @@ imported as: See the Doxygen documentation for details about the blocks available in this package. A quick listing of the details can be found in Python -after importing by using: +after importing by using: help(fec) diff --git a/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h index c0c4efa2d0..99ed154c81 100644 --- a/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h +++ b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h @@ -48,11 +48,11 @@ namespace gr { * The first 32 bits out will be zeroes, with the output delayed four bytes * from the corresponding inputs. */ - + class FEC_API decode_ccsds_27_fb : virtual public sync_decimator { public: - + // gr::fec::decode_ccsds_27_fb::sptr typedef boost::shared_ptr<decode_ccsds_27_fb> sptr; diff --git a/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h index d920b60983..e1772cd2fe 100644 --- a/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h +++ b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h @@ -45,11 +45,11 @@ namespace gr { * This block is designed for continuous data streaming, not packetized data. * There is no provision to "flush" the encoder. */ - + class FEC_API encode_ccsds_27_bb : virtual public sync_interpolator { public: - + // gr::fec::encode_ccsds_27_bb::sptr typedef boost::shared_ptr<encode_ccsds_27_bb> sptr; |