From d257a0c3f11c0845d7eda1c2c78b2c32b5ec7c4c Mon Sep 17 00:00:00 2001
From: Sebastian Müller <senpo@posteo.de>
Date: Sat, 20 Oct 2018 13:38:47 +0200
Subject: Change vector length variables to unsigned type
---
gr-blocks/include/gnuradio/blocks/integrate.h | 2 +-
gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h | 2 +-
gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h | 3 ++-
gr-blocks/include/gnuradio/blocks/vector_sink.h | 2 +-
gr-blocks/include/gnuradio/blocks/vector_source.h | 2 +-
gr-blocks/lib/integrate_impl.cc | 4 ++--
gr-blocks/lib/integrate_impl.h | 4 ++--
gr-blocks/lib/stream_to_tagged_stream_impl.cc | 4 ++--
gr-blocks/lib/stream_to_tagged_stream_impl.h | 2 +-
gr-blocks/lib/tsb_vector_sink_impl.cc | 4 ++--
gr-blocks/lib/tsb_vector_sink_impl.h | 4 ++--
gr-blocks/lib/vector_sink_impl.cc | 4 ++--
gr-blocks/lib/vector_sink_impl.h | 4 ++--
gr-blocks/lib/vector_source_impl.cc | 4 ++--
gr-blocks/lib/vector_source_impl.h | 4 ++--
gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h | 2 +-
gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h | 4 ++--
gr-qtgui/lib/vector_sink_f_impl.cc | 6 +++---
gr-qtgui/lib/vector_sink_f_impl.h | 6 +++---
24 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/gr-blocks/include/gnuradio/blocks/integrate.h b/gr-blocks/include/gnuradio/blocks/integrate.h
index b10c6595eb..0eef4bfd34 100644
--- a/gr-blocks/include/gnuradio/blocks/integrate.h
+++ b/gr-blocks/include/gnuradio/blocks/integrate.h
@@ -43,7 +43,7 @@ template<class T>
// gr::blocks::integrate::sptr
typedef boost::shared_ptr< integrate<T> > sptr;
- static sptr make(int decim, int vlen = 1);
+ static sptr make(int decim, unsigned int vlen = 1);
};
typedef integrate<std::int16_t> integrate_ss;
diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h b/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h
index 9b390b6cef..502412a6bc 100644
--- a/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h
+++ b/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h
@@ -55,7 +55,7 @@ namespace gr {
*/
static sptr make(
size_t itemsize,
- int vlen,
+ unsigned int vlen,
unsigned packet_len,
const std::string &len_tag_key
);
diff --git a/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h b/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h
index 7d0d3ff981..4e11e7761f 100644
--- a/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h
@@ -54,7 +54,8 @@ template<class T>
* \param vlen Vector length
* \param tsb_key Tagged Stream Key
*/
- static sptr make(int vlen=1, const std::string &tsb_key="ts_last");
+ static sptr make(unsigned int vlen=1,
+ const std::string &tsb_key="ts_last");
};
typedef tsb_vector_sink<std::uint8_t> tsb_vector_sink_b;
typedef tsb_vector_sink<std::uint32_t> tsb_vector_sink_i;
diff --git a/gr-blocks/include/gnuradio/blocks/vector_sink.h b/gr-blocks/include/gnuradio/blocks/vector_sink.h
index 6723d84e3f..581e0be970 100644
--- a/gr-blocks/include/gnuradio/blocks/vector_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_sink.h
@@ -51,7 +51,7 @@ template<class T>
* memory allocations during runtime, especially if you know a
* priori how many items you're going to store.
*/
- static sptr make(const int vlen = 1, const int reserve_items = 1024);
+ static sptr make(const unsigned int vlen = 1, const int reserve_items = 1024);
//! Clear the data and tags containers.
virtual void reset() = 0;
diff --git a/gr-blocks/include/gnuradio/blocks/vector_source.h b/gr-blocks/include/gnuradio/blocks/vector_source.h
index 189bdadb4b..ae25d85b62 100644
--- a/gr-blocks/include/gnuradio/blocks/vector_source.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_source.h
@@ -71,7 +71,7 @@ template<class T>
typedef boost::shared_ptr< vector_source<T> > sptr;
static sptr make(const std::vector<T> &data,
- bool repeat=false, int vlen=1,
+ bool repeat=false, unsigned int vlen=1,
const std::vector<tag_t> &tags=std::vector<tag_t>());
virtual void rewind() = 0;
diff --git a/gr-blocks/lib/integrate_impl.cc b/gr-blocks/lib/integrate_impl.cc
index 3c2cf022cb..9fa4035726 100644
--- a/gr-blocks/lib/integrate_impl.cc
+++ b/gr-blocks/lib/integrate_impl.cc
@@ -32,13 +32,13 @@ namespace gr {
namespace blocks {
template <class T>
- typename integrate<T>::sptr integrate<T>::make(int decim, int vlen)
+ typename integrate<T>::sptr integrate<T>::make(int decim, unsigned int vlen)
{
return gnuradio::get_initial_sptr(new integrate_impl<T> (decim, vlen));
}
template <class T>
- integrate_impl<T> ::integrate_impl(int decim, int vlen)
+ integrate_impl<T> ::integrate_impl(int decim, unsigned int vlen)
: sync_decimator("integrate",
io_signature::make(1, 1, sizeof (T) * vlen),
io_signature::make(1, 1, sizeof (T) * vlen),
diff --git a/gr-blocks/lib/integrate_impl.h b/gr-blocks/lib/integrate_impl.h
index efe475e103..30c2142f42 100644
--- a/gr-blocks/lib/integrate_impl.h
+++ b/gr-blocks/lib/integrate_impl.h
@@ -33,10 +33,10 @@ template<class T>
class BLOCKS_API integrate_impl : public integrate<T>
{
int d_decim;
- int d_vlen;
+ unsigned int d_vlen;
public:
- integrate_impl (int decim, int vlen);
+ integrate_impl (int decim, unsigned int vlen);
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.cc b/gr-blocks/lib/stream_to_tagged_stream_impl.cc
index f0de33a16f..c38f09abaa 100644
--- a/gr-blocks/lib/stream_to_tagged_stream_impl.cc
+++ b/gr-blocks/lib/stream_to_tagged_stream_impl.cc
@@ -32,13 +32,13 @@ namespace gr {
namespace blocks {
stream_to_tagged_stream::sptr
- stream_to_tagged_stream::make(size_t itemsize, int vlen, unsigned packet_len, const std::string &len_tag_key)
+ stream_to_tagged_stream::make(size_t itemsize, unsigned int vlen, unsigned packet_len, const std::string &len_tag_key)
{
return gnuradio::get_initial_sptr
(new stream_to_tagged_stream_impl(itemsize, vlen, packet_len, len_tag_key));
}
- stream_to_tagged_stream_impl::stream_to_tagged_stream_impl(size_t itemsize, int vlen, unsigned packet_len, const std::string &len_tag_key)
+ stream_to_tagged_stream_impl::stream_to_tagged_stream_impl(size_t itemsize, unsigned int vlen, unsigned packet_len, const std::string &len_tag_key)
: gr::sync_block("stream_to_tagged_stream",
gr::io_signature::make(1, 1, itemsize * vlen),
gr::io_signature::make(1, 1, itemsize * vlen)),
diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.h b/gr-blocks/lib/stream_to_tagged_stream_impl.h
index 586bd202fa..82c920296f 100644
--- a/gr-blocks/lib/stream_to_tagged_stream_impl.h
+++ b/gr-blocks/lib/stream_to_tagged_stream_impl.h
@@ -38,7 +38,7 @@ namespace gr {
uint64_t d_next_tag_pos;
public:
- stream_to_tagged_stream_impl(size_t itemsize, int vlen, unsigned packet_len, const std::string &tag_len_key);
+ stream_to_tagged_stream_impl(size_t itemsize, unsigned int vlen, unsigned packet_len, const std::string &tag_len_key);
~stream_to_tagged_stream_impl();
void set_packet_len(unsigned packet_len);
void set_packet_len_pmt(unsigned packet_len);
diff --git a/gr-blocks/lib/tsb_vector_sink_impl.cc b/gr-blocks/lib/tsb_vector_sink_impl.cc
index e4a3474e96..79c1fe7c73 100644
--- a/gr-blocks/lib/tsb_vector_sink_impl.cc
+++ b/gr-blocks/lib/tsb_vector_sink_impl.cc
@@ -33,14 +33,14 @@ namespace gr {
template <class T>
typename tsb_vector_sink<T>::sptr
- tsb_vector_sink<T>::make(int vlen, const std::string &tsb_key)
+ tsb_vector_sink<T>::make(unsigned int vlen, const std::string &tsb_key)
{
return gnuradio::get_initial_sptr
(new tsb_vector_sink_impl<T> (vlen, tsb_key));
}
template <class T>
- tsb_vector_sink_impl<T> ::tsb_vector_sink_impl(int vlen, const std::string &tsb_key)
+ tsb_vector_sink_impl<T> ::tsb_vector_sink_impl(unsigned int vlen, const std::string &tsb_key)
: gr::tagged_stream_block("tsb_vector_sink",
gr::io_signature::make(1, 1, vlen * sizeof(T)),
gr::io_signature::make(0, 0, 0), tsb_key),
diff --git a/gr-blocks/lib/tsb_vector_sink_impl.h b/gr-blocks/lib/tsb_vector_sink_impl.h
index 555e80c7dd..6da7e2de6e 100644
--- a/gr-blocks/lib/tsb_vector_sink_impl.h
+++ b/gr-blocks/lib/tsb_vector_sink_impl.h
@@ -35,10 +35,10 @@ template<class T>
private:
std::vector<std::vector<T> > d_data;
std::vector<tag_t> d_tags;
- int d_vlen;
+ unsigned int d_vlen;
public:
- tsb_vector_sink_impl (int vlen, const std::string &tsb_key);
+ tsb_vector_sink_impl (unsigned int vlen, const std::string &tsb_key);
~tsb_vector_sink_impl ();
void reset() { d_data.clear(); }
diff --git a/gr-blocks/lib/vector_sink_impl.cc b/gr-blocks/lib/vector_sink_impl.cc
index f27ebd1668..dfa6dbb4a5 100644
--- a/gr-blocks/lib/vector_sink_impl.cc
+++ b/gr-blocks/lib/vector_sink_impl.cc
@@ -36,14 +36,14 @@ namespace gr {
template <class T>
typename vector_sink<T>::sptr
- vector_sink<T>::make(int vlen, const int reserve_items)
+ vector_sink<T>::make(unsigned int vlen, const int reserve_items)
{
return gnuradio::get_initial_sptr
(new vector_sink_impl<T> (vlen, reserve_items));
}
template <class T>
- vector_sink_impl<T> ::vector_sink_impl(int vlen, const int reserve_items)
+ vector_sink_impl<T> ::vector_sink_impl(unsigned int vlen, const int reserve_items)
: sync_block("vector_sink",
io_signature::make(1, 1, sizeof(T) * vlen),
io_signature::make(0, 0, 0)),
diff --git a/gr-blocks/lib/vector_sink_impl.h b/gr-blocks/lib/vector_sink_impl.h
index 23d177eea5..6e18e0b006 100644
--- a/gr-blocks/lib/vector_sink_impl.h
+++ b/gr-blocks/lib/vector_sink_impl.h
@@ -37,10 +37,10 @@ template<class T>
std::vector<T> d_data;
std::vector<tag_t> d_tags;
mutable gr::thread::mutex d_data_mutex; // protects internal data access.
- int d_vlen;
+ unsigned int d_vlen;
public:
- vector_sink_impl (int vlen, const int reserve_items);
+ vector_sink_impl (unsigned int vlen, const int reserve_items);
~vector_sink_impl ();
void reset();
diff --git a/gr-blocks/lib/vector_source_impl.cc b/gr-blocks/lib/vector_source_impl.cc
index fd1ad16981..d49c37f5dd 100644
--- a/gr-blocks/lib/vector_source_impl.cc
+++ b/gr-blocks/lib/vector_source_impl.cc
@@ -36,7 +36,7 @@ namespace gr {
template <class T>
typename vector_source<T>::sptr
vector_source<T>::make(const std::vector<T> &data,
- bool repeat, int vlen,
+ bool repeat, unsigned int vlen,
const std::vector<tag_t> &tags)
{
return gnuradio::get_initial_sptr
@@ -45,7 +45,7 @@ namespace gr {
template <class T>
vector_source_impl<T> ::vector_source_impl(const std::vector<T> &data,
- bool repeat, int vlen,
+ bool repeat, unsigned int vlen,
const std::vector<tag_t> &tags)
: sync_block("vector_source",
io_signature::make(0, 0, 0),
diff --git a/gr-blocks/lib/vector_source_impl.h b/gr-blocks/lib/vector_source_impl.h
index b4161d68fc..19966d01e8 100644
--- a/gr-blocks/lib/vector_source_impl.h
+++ b/gr-blocks/lib/vector_source_impl.h
@@ -36,13 +36,13 @@ template<class T>
std::vector<T> d_data;
bool d_repeat;
unsigned int d_offset;
- int d_vlen;
+ unsigned int d_vlen;
bool d_settags;
std::vector<tag_t> d_tags;
public:
vector_source_impl (const std::vector<T> &data,
- bool repeat, int vlen,
+ bool repeat, unsigned int vlen,
const std::vector<tag_t> &tags);
~vector_source_impl ();
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
index c547b5f595..69278c0909 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
@@ -55,7 +55,7 @@ namespace gr {
* \param iterations PAPR algorithm number of iterations.
* \param vlength input and output vector length.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, int vlength);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, unsigned int vlength);
};
} // namespace dtv
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
index 6d44562d59..0e7091556f 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
@@ -57,7 +57,7 @@ namespace gr {
* \param bandwidth sin(x)/x equalization bandwidth.
* \param vlength output vector length.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int vlength);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, unsigned int vlength);
};
} // namespace dtv
diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
index bcdc4c66ac..f804936a57 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
@@ -35,7 +35,7 @@ namespace gr {
namespace dtv {
dvbt2_paprtr_cc::sptr
- dvbt2_paprtr_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, int vlength)
+ dvbt2_paprtr_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, unsigned int vlength)
{
return gnuradio::get_initial_sptr
(new dvbt2_paprtr_cc_impl(carriermode, fftsize, pilotpattern, guardinterval, numdatasyms, paprmode, version, vclip, iterations, vlength));
@@ -44,7 +44,7 @@ namespace gr {
/*
* The private constructor
*/
- dvbt2_paprtr_cc_impl::dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, int vlength)
+ dvbt2_paprtr_cc_impl::dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, unsigned int vlength)
: gr::sync_block("dvbt2_paprtr_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex) * vlength),
gr::io_signature::make(1, 1, sizeof(gr_complex) * vlength))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
index aac5e48c3f..3e2245392b 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
@@ -97,7 +97,7 @@ namespace gr {
const static int tr_papr_map_32k[288];
public:
- dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, int vlength);
+ dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip, int iterations, unsigned int vlength);
~dvbt2_paprtr_cc_impl();
int work(int noutput_items,
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
index 3724533b3d..f4d6233b53 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
@@ -31,7 +31,7 @@ namespace gr {
namespace dtv {
dvbt2_pilotgenerator_cc::sptr
- dvbt2_pilotgenerator_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int vlength)
+ dvbt2_pilotgenerator_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, unsigned int vlength)
{
return gnuradio::get_initial_sptr
(new dvbt2_pilotgenerator_cc_impl(carriermode, fftsize, pilotpattern, guardinterval, numdatasyms, paprmode, version, preamble, misogroup, equalization, bandwidth, vlength));
@@ -40,7 +40,7 @@ namespace gr {
/*
* The private constructor
*/
- dvbt2_pilotgenerator_cc_impl::dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int vlength)
+ dvbt2_pilotgenerator_cc_impl::dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, unsigned int vlength)
: gr::block("dvbt2_pilotgenerator_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(gr_complex) * vlength))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
index f99d8a603f..6543e26512 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
@@ -155,7 +155,7 @@ namespace gr {
const static int pp8_32k[6];
public:
- dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int vlength);
+ dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, unsigned int vlength);
~dvbt2_pilotgenerator_cc_impl();
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
diff --git a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h
index 19284b19ad..26ce06b1f8 100644
--- a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h
@@ -69,7 +69,7 @@ namespace gr {
* \param parent a QWidget parent object, if any
*/
static sptr make(
- int vlen,
+ unsigned int vlen,
double x_start,
double x_step,
const std::string &x_axis_label,
@@ -88,7 +88,7 @@ namespace gr {
virtual void* pyqwidget() = 0;
#endif
- virtual int vlen() const = 0;
+ virtual unsigned int vlen() const = 0;
virtual void set_vec_average(const float avg) = 0;
virtual float vec_average() const = 0;
diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc
index 06928cfc3b..705482266e 100644
--- a/gr-qtgui/lib/vector_sink_f_impl.cc
+++ b/gr-qtgui/lib/vector_sink_f_impl.cc
@@ -41,7 +41,7 @@ namespace gr {
vector_sink_f::sptr
vector_sink_f::make(
- int vlen,
+ unsigned int vlen,
double x_start,
double x_step,
const std::string &x_axis_label,
@@ -65,7 +65,7 @@ namespace gr {
}
vector_sink_f_impl::vector_sink_f_impl(
- int vlen,
+ unsigned int vlen,
double x_start,
double x_step,
const std::string &x_axis_label,
@@ -194,7 +194,7 @@ namespace gr {
}
#endif
- int
+ unsigned int
vector_sink_f_impl::vlen() const
{
return d_vlen;
diff --git a/gr-qtgui/lib/vector_sink_f_impl.h b/gr-qtgui/lib/vector_sink_f_impl.h
index 400674f948..c7f635358e 100644
--- a/gr-qtgui/lib/vector_sink_f_impl.h
+++ b/gr-qtgui/lib/vector_sink_f_impl.h
@@ -42,7 +42,7 @@ namespace gr {
double x_step
);
- const int d_vlen; //!< Vector length at input
+ const unsigned int d_vlen; //!< Vector length at input
float d_vecavg;
std::string d_name; //!< Initial title of the plot
@@ -71,7 +71,7 @@ namespace gr {
public:
vector_sink_f_impl(
- int vlen,
+ unsigned int vlen,
double x_start,
double x_step,
const std::string &x_axis_label,
@@ -93,7 +93,7 @@ namespace gr {
void* pyqwidget();
#endif
- int vlen() const;
+ unsigned int vlen() const;
void set_vec_average(const float avg);
float vec_average() const;
--
cgit v1.2.3