5 files changed, 9 insertions, 9 deletions
diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc
index b2dd5e36af..3bba4b9aa0 100644
--- a/gr-blocks/lib/file_descriptor_source_impl.cc
+++ b/gr-blocks/lib/file_descriptor_source_impl.cc
@@ -98,7 +98,7 @@ int file_descriptor_source_impl::read_items(char* buf, int nitems)
 int file_descriptor_source_impl::handle_residue(char* buf, int nbytes_read)
 {
     assert(nbytes_read >= 0);
-    const int nitems_read = nbytes_read / d_itemsize;
+    const unsigned int nitems_read = nbytes_read / d_itemsize;
     d_residue_len = nbytes_read % d_itemsize;
     if (d_residue_len > 0) {
         // fprintf (stderr, "handle_residue: %d\n", d_residue_len);
diff --git a/gr-digital/include/gnuradio/digital/costas_loop_cc.h b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
index 79b81f35ae..621f732fe9 100644
--- a/gr-digital/include/gnuradio/digital/costas_loop_cc.h
+++ b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
@@ -77,7 +77,7 @@ public:
      * \param use_snr Use or ignore SNR estimates (from noise message port)
      *        in measurements; also uses tanh instead of slicing.
      */
-    static sptr make(float loop_bw, int order, bool use_snr = false);
+    static sptr make(float loop_bw, unsigned int order, bool use_snr = false);
 
     /*!
      * Returns the current value of the loop error.
diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc
index 4129dd05fa..105fce639d 100644
--- a/gr-digital/lib/costas_loop_cc_impl.cc
+++ b/gr-digital/lib/costas_loop_cc_impl.cc
@@ -34,7 +34,7 @@
 namespace gr {
 namespace digital {
 
-costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr)
+costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, unsigned int order, bool use_snr)
 {
     return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr));
 }
@@ -42,7 +42,7 @@ costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr
 static int ios[] = { sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) };
 static std::vector<int> iosig(ios, ios + sizeof(ios) / sizeof(int));
 
-costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr)
+costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, unsigned int order, bool use_snr)
     : sync_block("costas_loop_cc",
                  io_signature::make(1, 1, sizeof(gr_complex)),
                  io_signature::makev(1, 4, iosig)),
@@ -59,7 +59,7 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr)
 
 costas_loop_cc_impl::~costas_loop_cc_impl() {}
 
-costas_loop_cc_impl::d_phase_detector_t costas_loop_cc_impl::choose_phase_detector(int order, bool use_snr)
+costas_loop_cc_impl::d_phase_detector_t costas_loop_cc_impl::choose_phase_detector(unsigned int order, bool use_snr)
 {
   switch (order) {
   case 2:
diff --git a/gr-digital/lib/costas_loop_cc_impl.h b/gr-digital/lib/costas_loop_cc_impl.h
index 87655a44cf..a216aaf0ff 100644
--- a/gr-digital/lib/costas_loop_cc_impl.h
+++ b/gr-digital/lib/costas_loop_cc_impl.h
@@ -32,7 +32,7 @@ namespace digital {
 class costas_loop_cc_impl : public costas_loop_cc
 {
 private:
-    const int d_order;
+    const unsigned int d_order;
     float d_error;
     float d_noise;
 
@@ -86,11 +86,11 @@ private:
     float phase_detector_snr_2(gr_complex sample) const; // for BPSK
 
     typedef float (costas_loop_cc_impl::*d_phase_detector_t)(gr_complex sample) const;
-    static d_phase_detector_t choose_phase_detector(int order, bool use_snr);
+    static d_phase_detector_t choose_phase_detector(unsigned int order, bool use_snr);
     const d_phase_detector_t d_phase_detector;
 
 public:
-    costas_loop_cc_impl(float loop_bw, int order, bool use_snr = false);
+    costas_loop_cc_impl(float loop_bw, unsigned int order, bool use_snr = false);
     ~costas_loop_cc_impl();
 
     float error() const;
diff --git a/gr-digital/lib/diff_encoder_bb_impl.cc b/gr-digital/lib/diff_encoder_bb_impl.cc
index 447a8da6c5..70b1b0224f 100644
--- a/gr-digital/lib/diff_encoder_bb_impl.cc
+++ b/gr-digital/lib/diff_encoder_bb_impl.cc
@@ -55,7 +55,7 @@ int diff_encoder_bb_impl::work(int noutput_items,
 
     unsigned last_out = d_last_out;
 
-    for (int i = 0; i < noutput_items; i++) {
+    for (unsigned int i = 0; i < noutput_items; i++) {
         out[i] = (in[i] + last_out) % d_modulus;
         last_out = out[i];
     }