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/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 ++--
10 files changed, 19 insertions(+), 19 deletions(-)
(limited to 'gr-blocks/lib')
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 ();
--
cgit v1.2.3