15 files changed, 25 insertions, 24 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 ();