diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-14 14:46:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-14 14:46:33 -0700 |
| commit | 2d458a7db0b147c7b44e31db69ecf43432664040 (patch) | |
| tree | b290219a20b7cc1a36518f5534197550d02ac91d | |
| parent | 7d29847824e68966de9dbeada02fa1d9a22ee8da (diff) | |
| parent | 767d98ac9bc2266222f7e19afa786820e91b3076 (diff) | |
Merge branch 'next' into python3
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/types.h | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/buffer.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/include/gnuradio/types.h b/gnuradio-runtime/include/gnuradio/types.h index c91538e60e..5d645ad3f9 100644 --- a/gnuradio-runtime/include/gnuradio/types.h +++ b/gnuradio-runtime/include/gnuradio/types.h @@ -30,6 +30,8 @@ #include <gnuradio/gr_complex.h> +#include <stdint.h> + typedef std::vector<int> gr_vector_int; typedef std::vector<unsigned int> gr_vector_uint; typedef std::vector<float> gr_vector_float; @@ -37,6 +39,4 @@ typedef std::vector<double> gr_vector_double; typedef std::vector<void *> gr_vector_void_star; typedef std::vector<const void *> gr_vector_const_void_star; -#include <stdint.h> - #endif /* INCLUDED_GR_TYPES_H */ diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc index b706408412..db554d21e7 100644 --- a/gnuradio-runtime/lib/buffer.cc +++ b/gnuradio-runtime/lib/buffer.cc @@ -346,7 +346,7 @@ namespace gr { { gr::thread::scoped_lock guard(*mutex()); - v.resize(0); + v.clear(); std::multimap<uint64_t,tag_t>::iterator itr = d_buffer->get_tags_lower_bound(std::min(abs_start, abs_start - d_attr_delay)); std::multimap<uint64_t,tag_t>::iterator itr_end = d_buffer->get_tags_upper_bound(std::min(abs_end, abs_end - d_attr_delay)); |