[hamradio-commits] [gnss-sdr] 15/44: Ensuring that the unsigned int is 32-bit wide.

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 8f9466ba57aef0012fbb606b69bff64a697cc0a9
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Feb 4 03:06:42 2015 +0100

    Ensuring that the unsigned int is 32-bit wide.
---
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc   | 6 +++---
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h    | 7 ++++---
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc   | 4 ++--
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h    | 7 ++++---
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc   | 5 ++---
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h    | 7 ++++---
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
index ed164b8..a3e3687 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
@@ -37,7 +37,7 @@
 #include <iostream>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include <volk/volk.h>
+
 
 using google::LogMessage;
 
@@ -61,11 +61,11 @@ direct_resampler_conditioner_cb::direct_resampler_conditioner_cb(
     // Computes the phase step multiplying the resampling ratio by 2^32 = 4294967296
     if (d_sample_freq_in >= d_sample_freq_out)
     {
-        d_phase_step = static_cast<unsigned int>(floor(two_32 * sample_freq_out / sample_freq_in));
+        d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_out / sample_freq_in));
     }
     else
     {
-        d_phase_step = static_cast<unsigned int>(floor(two_32 * sample_freq_in / sample_freq_out));
+        d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_in / sample_freq_out));
     }
 
     set_relative_rate(1.0 * sample_freq_out / sample_freq_in);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
index 8f34c64..8565d94 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
@@ -33,6 +33,7 @@
 #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H
 
 #include <gnuradio/block.h>
+#include <volk/volk.h>
 
 class direct_resampler_conditioner_cb;
 typedef boost::shared_ptr<direct_resampler_conditioner_cb>
@@ -57,9 +58,9 @@ private:
 
     double d_sample_freq_in;
     double d_sample_freq_out;
-    unsigned int d_phase;
-    unsigned int d_lphase;
-    unsigned int d_phase_step;
+    uint32_t d_phase;
+    uint32_t d_lphase;
+    uint32_t d_phase_step;
     unsigned int d_history;
 
     direct_resampler_conditioner_cb(double sample_freq_in,
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
index eef49f5..828a11a 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
@@ -63,11 +63,11 @@ direct_resampler_conditioner_cc::direct_resampler_conditioner_cc(
     const double two_32 = 4294967296.0;
     if (d_sample_freq_in >= d_sample_freq_out)
         {
-            d_phase_step = static_cast<unsigned int>(floor(two_32 * sample_freq_out / sample_freq_in));
+            d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_out / sample_freq_in));
         }
     else
         {
-            d_phase_step =  static_cast<unsigned int>(floor(two_32 * sample_freq_in / sample_freq_out));
+            d_phase_step =  static_cast<uint32_t>(floor(two_32 * sample_freq_in / sample_freq_out));
         }
     set_relative_rate(1.0 * sample_freq_out / sample_freq_in);
     set_output_multiple(1);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
index 2fcc494..de8c032 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
@@ -40,6 +40,7 @@
 #define	GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H
 
 #include <gnuradio/block.h>
+#include <volk/volk.h>
 
 class direct_resampler_conditioner_cc;
 typedef boost::shared_ptr<direct_resampler_conditioner_cc> direct_resampler_conditioner_cc_sptr;
@@ -60,9 +61,9 @@ private:
             double sample_freq_out);
     double d_sample_freq_in;  //! Specifies the sampling frequency of the input signal
     double d_sample_freq_out; //! Specifies the sampling frequency of the output signal
-    unsigned int d_phase;
-    unsigned int d_lphase;
-    unsigned int d_phase_step;
+    uint32_t d_phase;
+    uint32_t d_lphase;
+    uint32_t d_phase_step;
     unsigned int d_history;
     direct_resampler_conditioner_cc(double sample_freq_in,
             double sample_freq_out);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
index 3f5830e..1ed0872 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
@@ -37,7 +37,6 @@
 #include <iostream>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include <volk/volk.h>
 
 using google::LogMessage;
 
@@ -61,11 +60,11 @@ direct_resampler_conditioner_cs::direct_resampler_conditioner_cs(
     // Computes the phase step multiplying the resampling ratio by 2^32 = 4294967296
     if (d_sample_freq_in >= d_sample_freq_out)
     {
-        d_phase_step = static_cast<unsigned int>(floor(two_32 * sample_freq_out / sample_freq_in));
+        d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_out / sample_freq_in));
     }
     else
     {
-        d_phase_step = static_cast<unsigned int>(floor(two_32 * sample_freq_in / sample_freq_out));
+        d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_in / sample_freq_out));
     }
 
     set_relative_rate(1.0 * sample_freq_out / sample_freq_in);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
index eb0b69d..ed64ca2 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
@@ -33,6 +33,7 @@
 #define	GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H
 
 #include <gnuradio/block.h>
+#include <volk/volk.h>
 
 class direct_resampler_conditioner_cs;
 typedef boost::shared_ptr<direct_resampler_conditioner_cs>
@@ -57,9 +58,9 @@ private:
 
     double d_sample_freq_in;
     double d_sample_freq_out;
-    unsigned int d_phase;
-    unsigned int d_lphase;
-    unsigned int d_phase_step;
+    uint32_t d_phase;
+    uint32_t d_lphase;
+    uint32_t d_phase_step;
     unsigned int d_history;
 
     direct_resampler_conditioner_cs(double sample_freq_in,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git