diff options
-rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 | ||||
-rw-r--r-- | gr-blocks/include/gnuradio/blocks/tag_share.h | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index b2eabd57d0..de8be5cc19 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -179,7 +179,7 @@ macro(GR_SWIG_MAKE name) list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${tag_file}) #setup the swig flags with flags and include directories - set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS}) + set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -w314 -module ${name} ${GR_SWIG_FLAGS}) #set the C++ property on the swig .i file so it builds set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON) diff --git a/gr-blocks/include/gnuradio/blocks/tag_share.h b/gr-blocks/include/gnuradio/blocks/tag_share.h index b2d288f6a5..476076c6f5 100644 --- a/gr-blocks/include/gnuradio/blocks/tag_share.h +++ b/gr-blocks/include/gnuradio/blocks/tag_share.h @@ -1,26 +1,25 @@ /* -*- c++ -*- */ -/* +/* * Copyright 2017 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, * Boston, MA 02110-1301, USA. */ - #ifndef INCLUDED_BLOCKS_TAG_SHARE_H #define INCLUDED_BLOCKS_TAG_SHARE_H @@ -40,7 +39,7 @@ namespace gr { * useful when a signal is detected via a correlate_access_code_bb or * a threshold crossing from a complex_to_mag_squared block. The tag from * that detection is on the alternate stream, either bytes or floats. - * Often there is further signal processing that should be done on the + * Often there is further signal processing that should be done on the * complex stream. This block allows the detection tags to be added to * the complex stream to trigger downstream processing without the need of * redundant trigger inputs on all subsequent blocks. @@ -57,6 +56,7 @@ namespace gr { * stream type does not have to match the input/output stream type. Tags from * Input 1's items will be combined with Input 0's item tags and outputted on * Output 0. + * \param vlen The vector size of the input and output stream items */ static sptr make(size_t sizeof_io_item, size_t sizeof_share_item, size_t vlen = 1); }; @@ -65,4 +65,3 @@ namespace gr { } // namespace gr #endif /* INCLUDED_BLOCKS_TAG_SHARE_H */ - |