diff options
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/swig/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-digital/include/digital/constellation.h | 2 | ||||
| -rw-r--r-- | gr-digital/include/digital/ofdm_equalizer_base.h | 2 | ||||
| -rw-r--r-- | gr-digital/include/digital/packet_header_default.h | 2 | ||||
| -rw-r--r-- | gr-digital/lib/crc32_bb_impl.cc | 4 | ||||
| -rw-r--r-- | gr-wxgui/swig/CMakeLists.txt | 1 |
8 files changed, 9 insertions, 5 deletions
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index d21beb1414..bc83f5c10f 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -54,6 +54,7 @@ include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../include/ ${VOLK_INCLUDE_DIRS} + ${ICE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index bdd7ca77a6..2c952126a9 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -128,6 +128,7 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} + ${ICE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt index 08e48fb69d..8a7327b0a2 100644 --- a/gr-blocks/swig/CMakeLists.txt +++ b/gr-blocks/swig/CMakeLists.txt @@ -28,6 +28,7 @@ set(GR_SWIG_INCLUDE_DIRS ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} + ${ICE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/digital/constellation.h index a7a2ec2023..48a06ed8a8 100644 --- a/gr-digital/include/digital/constellation.h +++ b/gr-digital/include/digital/constellation.h @@ -65,7 +65,7 @@ namespace gr { unsigned int rotational_symmetry, unsigned int dimensionality); constellation(); - ~constellation(); + virtual ~constellation(); //! Returns the constellation points for a symbol value void map_to_points(unsigned int value, gr_complex *points); diff --git a/gr-digital/include/digital/ofdm_equalizer_base.h b/gr-digital/include/digital/ofdm_equalizer_base.h index 0e23eb381f..c13c07f590 100644 --- a/gr-digital/include/digital/ofdm_equalizer_base.h +++ b/gr-digital/include/digital/ofdm_equalizer_base.h @@ -45,7 +45,7 @@ namespace gr { typedef boost::shared_ptr<ofdm_equalizer_base> sptr; ofdm_equalizer_base(int fft_len); - ~ofdm_equalizer_base(); + virtual ~ofdm_equalizer_base(); //! Reset the channel information state knowledge virtual void reset() = 0; diff --git a/gr-digital/include/digital/packet_header_default.h b/gr-digital/include/digital/packet_header_default.h index d69a0f30a6..f97b1a4c81 100644 --- a/gr-digital/include/digital/packet_header_default.h +++ b/gr-digital/include/digital/packet_header_default.h @@ -84,7 +84,7 @@ namespace gr { /*! * \brief Inverse function to header_formatter(). * - * Reads the bit stream in \in and writes a corresponding tag into \p tags. + * Reads the bit stream in and writes a corresponding tag into \p tags. * */ bool header_parser( diff --git a/gr-digital/lib/crc32_bb_impl.cc b/gr-digital/lib/crc32_bb_impl.cc index 608c5758ac..89cc0d1083 100644 --- a/gr-digital/lib/crc32_bb_impl.cc +++ b/gr-digital/lib/crc32_bb_impl.cc @@ -87,9 +87,9 @@ namespace gr { std::vector<gr_tag_t> tags; get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+packet_length); - for (unsigned i = 0; i < tags.size(); i++) { + for (size_t i = 0; i < tags.size(); i++) { tags[i].offset -= nitems_read(0); - if (d_check && tags[i].offset > packet_length+packet_size_diff) { + if (d_check && tags[i].offset > (unsigned int)(packet_length+packet_size_diff)) { tags[i].offset = packet_length-5; } add_item_tag(0, nitems_written(0) + tags[i].offset, diff --git a/gr-wxgui/swig/CMakeLists.txt b/gr-wxgui/swig/CMakeLists.txt index 3806b8e36a..1c8e82f9b9 100644 --- a/gr-wxgui/swig/CMakeLists.txt +++ b/gr-wxgui/swig/CMakeLists.txt @@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/../include ${GR_WXGUI_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} + ${ICE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ) |