diff options
| author | eb | 2008-08-20 17:53:16 +0000 |
|---|---|---|
| committer | eb | 2008-08-20 17:53:16 +0000 |
| commit | ec20f96de2e8a1ab95e370522eeb6ba840c9f09e (patch) | |
| tree | fab317cc2e25fd7b560fa7a6378d8613b364c878 /gr-msdd6000 | |
| parent | 081b90ecf5dfa5e0eac8cdd4918bcdba09345461 (diff) | |
| download | gnuradio-ec20f96de2e8a1ab95e370522eeb6ba840c9f09e.tar.gz gnuradio-ec20f96de2e8a1ab95e370522eeb6ba840c9f09e.tar.bz2 gnuradio-ec20f96de2e8a1ab95e370522eeb6ba840c9f09e.zip | |
fixes for gcc 4.3
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9351 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-msdd6000')
| -rw-r--r-- | gr-msdd6000/src/msdd_source_base.cc | 7 | ||||
| -rw-r--r-- | gr-msdd6000/src/msdd_source_simple.cc | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gr-msdd6000/src/msdd_source_base.cc b/gr-msdd6000/src/msdd_source_base.cc index 8adb72553..f1de068e3 100644 --- a/gr-msdd6000/src/msdd_source_base.cc +++ b/gr-msdd6000/src/msdd_source_base.cc @@ -33,6 +33,7 @@ #include <omnithread.h> #include <stdexcept> #include <iostream> +#include <limits.h> #ifdef HAVE_NETDB_H #include <netdb.h> #endif @@ -640,7 +641,7 @@ msdd_source_base::set_verbose (bool verbose) bool msdd_source_base::set_pga (int which, double gain) { - if (gain >= PGA_MIN & gain <= PGA_MAX) { + if (gain >= PGA_MIN && gain <= PGA_MAX) { pimpl->d_gain = gain; return true; } @@ -813,8 +814,10 @@ msdd_source_base::serial_number() bool msdd_source_base::set_desired_packet_size (int which, unsigned long packet_size) { bool result(false); - if (pimpl->d_desired_sample_size < 2^32) { // FIXME: find maximum sample request for MSDD check if greater than + //if (pimpl->d_desired_sample_size < 2^32) { // FIXME: find maximum sample request for MSDD check if greater than + if (pimpl->d_desired_sample_size < LONG_MAX) { // FIXME: find maximum sample request for MSDD check if greater than pimpl->d_desired_sample_size = packet_size; + result = true; } return result; } diff --git a/gr-msdd6000/src/msdd_source_simple.cc b/gr-msdd6000/src/msdd_source_simple.cc index ec83c5bff..cefac5476 100644 --- a/gr-msdd6000/src/msdd_source_simple.cc +++ b/gr-msdd6000/src/msdd_source_simple.cc @@ -24,6 +24,7 @@ #include <msdd_source_simple.h> #include <gr_io_signature.h> +#include <string.h> msdd_source_simple_sptr |