[Commit-gnuradio] r9351 - gnuradio/trunk/gr-msdd6000/src

[eb]

Author: eb
Date: 2008-08-20 11:53:16 -0600 (Wed, 20 Aug 2008)
New Revision: 9351

Modified:
   gnuradio/trunk/gr-msdd6000/src/msdd_source_base.cc
   gnuradio/trunk/gr-msdd6000/src/msdd_source_simple.cc
Log:
fixes for gcc 4.3

Modified: gnuradio/trunk/gr-msdd6000/src/msdd_source_base.cc
===================================================================
--- gnuradio/trunk/gr-msdd6000/src/msdd_source_base.cc  2008-08-20 17:30:12 UTC 
(rev 9350)
+++ gnuradio/trunk/gr-msdd6000/src/msdd_source_base.cc  2008-08-20 17:53:16 UTC 
(rev 9351)
@@ -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 @@
 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 @@
 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;
 }

Modified: gnuradio/trunk/gr-msdd6000/src/msdd_source_simple.cc
===================================================================
--- gnuradio/trunk/gr-msdd6000/src/msdd_source_simple.cc        2008-08-20 
17:30:12 UTC (rev 9350)
+++ gnuradio/trunk/gr-msdd6000/src/msdd_source_simple.cc        2008-08-20 
17:53:16 UTC (rev 9351)
@@ -24,6 +24,7 @@
 
 #include <msdd_source_simple.h>
 #include <gr_io_signature.h>
+#include <string.h>
 
 
 msdd_source_simple_sptr