[Commit-gnuradio] r5023 - in gnuradio/branches/developers/eb/ibu: gnuradio-core/src/lib/gengen gr-atsc/src/lib pmt/src/lib

[eb]

Author: eb
Date: 2007-04-16 15:30:25 -0600 (Mon, 16 Apr 2007)
New Revision: 5023

Modified:
   
gnuradio/branches/developers/eb/ibu/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t
   gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_bit_timing_loop.cc
   gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_field_sync_demux.cc
   gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_viterbi_decoder.cc
   gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt.cc
   gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt_serialize.cc
Log:
cleaned up some warning

Modified: 
gnuradio/branches/developers/eb/ibu/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t
===================================================================
--- 
gnuradio/branches/developers/eb/ibu/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t
       2007-04-16 21:30:13 UTC (rev 5022)
+++ 
gnuradio/branches/developers/eb/ibu/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t
       2007-04-16 21:30:25 UTC (rev 5023)
@@ -181,19 +181,19 @@
   /* The triangle wave rises from -PI to 0 and falls from 0 to PI.     */ 
   case GR_TRI_WAVE:    
     for (int i = 0; i < noutput_items; i++){
-      t = (@TYPE@) d_ampl*d_nco.get_phase()/M_PI;
-        if (d_nco.get_phase() < 0)
-          optr[i] = t + d_ampl + d_offset;
-        else
-          optr[i] = -1*t + d_ampl + d_offset;
-        d_nco.step();
+      double t = d_ampl*d_nco.get_phase()/M_PI;
+      if (d_nco.get_phase() < 0)
+       optr[i] = static_cast<@TYPE@>(t + d_ampl + d_offset);
+      else
+       optr[i] = static_cast<@TYPE@>(-1*t + d_ampl + d_offset);
+      d_nco.step();
     }
     break;
        
   /* The saw tooth wave rises from -PI to PI.  */
   case GR_SAW_WAVE:    
     for (int i = 0; i < noutput_items; i++){
-      t = (@TYPE@) d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset;
+      t = static_cast<@TYPE@>(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + 
d_offset);
       optr[i] = t;             
       d_nco.step();
     }

Modified: 
gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_bit_timing_loop.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_bit_timing_loop.cc 
2007-04-16 21:30:13 UTC (rev 5022)
+++ gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_bit_timing_loop.cc 
2007-04-16 21:30:25 UTC (rev 5023)
@@ -54,7 +54,7 @@
 {
   unsigned ninputs = ninput_items_required.size();
   for (unsigned i = 0; i < ninputs; i++)
-    ninput_items_required[i] = noutput_items * d_rx_clock_to_symbol_freq + 
1500 - 1;
+    ninput_items_required[i] = static_cast<int>(noutput_items * 
d_rx_clock_to_symbol_freq) + 1500 - 1;
 
   inputs0_size = noutput_items * d_rx_clock_to_symbol_freq + 1500 - 1;
   inputs0_index = d_next_input;

Modified: 
gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_field_sync_demux.cc
===================================================================
--- 
gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_field_sync_demux.cc    
    2007-04-16 21:30:13 UTC (rev 5022)
+++ 
gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_field_sync_demux.cc    
    2007-04-16 21:30:25 UTC (rev 5023)
@@ -32,10 +32,12 @@
 #include <atsci_syminfo.h>
 #include <stdio.h>
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
 
-using std::abs;
+using std::cerr;
+using std::endl;
 
+
 static const int        DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation 
factor
 
 

Modified: 
gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_viterbi_decoder.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_viterbi_decoder.cc 
2007-04-16 21:30:13 UTC (rev 5022)
+++ gnuradio/branches/developers/eb/ibu/gr-atsc/src/lib/atsc_viterbi_decoder.cc 
2007-04-16 21:30:25 UTC (rev 5023)
@@ -27,8 +27,10 @@
 #include <atsc_viterbi_decoder.h>
 #include <gr_io_signature.h>
 #include <atsc_consts.h>
-#include <iostream.h>
+#include <iostream>
 
+using std::cerr;
+using std::endl;
 
 atsc_viterbi_decoder_sptr
 atsc_make_viterbi_decoder()

Modified: gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt.cc      2007-04-16 
21:30:13 UTC (rev 5022)
+++ gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt.cc      2007-04-16 
21:30:25 UTC (rev 5023)
@@ -949,16 +949,16 @@
 void
 pmt_dump_sizeof()
 {
-  printf("sizeof(pmt_t)              = %3ld\n", sizeof(pmt_t));
-  printf("sizeof(pmt_base)           = %3ld\n", sizeof(pmt_base));
-  printf("sizeof(pmt_bool)           = %3ld\n", sizeof(pmt_bool));
-  printf("sizeof(pmt_symbol)         = %3ld\n", sizeof(pmt_symbol));
-  printf("sizeof(pmt_integer)        = %3ld\n", sizeof(pmt_integer));
-  printf("sizeof(pmt_real)           = %3ld\n", sizeof(pmt_real));
-  printf("sizeof(pmt_complex)        = %3ld\n", sizeof(pmt_complex));
-  printf("sizeof(pmt_null)           = %3ld\n", sizeof(pmt_null));
-  printf("sizeof(pmt_pair)           = %3ld\n", sizeof(pmt_pair));
-  printf("sizeof(pmt_vector)         = %3ld\n", sizeof(pmt_vector));
-  printf("sizeof(pmt_dict)           = %3ld\n", sizeof(pmt_dict));
-  printf("sizeof(pmt_uniform_vector) = %3ld\n", sizeof(pmt_uniform_vector));
+  printf("sizeof(pmt_t)              = %3zd\n", sizeof(pmt_t));
+  printf("sizeof(pmt_base)           = %3zd\n", sizeof(pmt_base));
+  printf("sizeof(pmt_bool)           = %3zd\n", sizeof(pmt_bool));
+  printf("sizeof(pmt_symbol)         = %3zd\n", sizeof(pmt_symbol));
+  printf("sizeof(pmt_integer)        = %3zd\n", sizeof(pmt_integer));
+  printf("sizeof(pmt_real)           = %3zd\n", sizeof(pmt_real));
+  printf("sizeof(pmt_complex)        = %3zd\n", sizeof(pmt_complex));
+  printf("sizeof(pmt_null)           = %3zd\n", sizeof(pmt_null));
+  printf("sizeof(pmt_pair)           = %3zd\n", sizeof(pmt_pair));
+  printf("sizeof(pmt_vector)         = %3zd\n", sizeof(pmt_vector));
+  printf("sizeof(pmt_dict)           = %3zd\n", sizeof(pmt_dict));
+  printf("sizeof(pmt_uniform_vector) = %3zd\n", sizeof(pmt_uniform_vector));
 }

Modified: gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt_serialize.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt_serialize.cc    
2007-04-16 21:30:13 UTC (rev 5022)
+++ gnuradio/branches/developers/eb/ibu/pmt/src/lib/pmt_serialize.cc    
2007-04-16 21:30:25 UTC (rev 5023)
@@ -57,6 +57,7 @@
   return sb.sputc((i >> 0) & 0xff) != std::streambuf::traits_type::eof();
 }
 
+#if 0
 // always writes big-endian
 static bool
 serialize_untagged_u64(uint64_t i, std::streambuf &sb)
@@ -70,6 +71,7 @@
   sb.sputc((i >>  8) & 0xff);
   return sb.sputc((i >> 0) & 0xff) != std::streambuf::traits_type::eof();
 }
+#endif
 
 // ----------------------------------------------------------------
 // input primitives
@@ -128,6 +130,7 @@
   return t != std::streambuf::traits_type::eof();
 }
 
+#if 0
 // always reads big-endian
 static bool
 deserialize_untagged_u64(uint64_t *ip, std::streambuf &sb)
@@ -156,6 +159,7 @@
   *ip = i;
   return t != std::streambuf::traits_type::eof();
 }
+#endif
 
 /*
  * Write portable byte-serial representation of \p obj to \p sb
@@ -203,7 +207,7 @@
     if (pmt_is_integer(obj)){
       long i = pmt_to_long(obj);
       if (sizeof(long) > 4){
-       if (i < -2147483648 || i > 2147483647)
+       if (i < -2147483647 || i > 2147483647)
          throw pmt_notimplemented("pmt_serialize (64-bit integers)", obj);
       }
       ok = serialize_untagged_u8(PST_INT32, sb);
@@ -241,10 +245,10 @@
 pmt_deserialize(std::streambuf &sb)
 {
   uint8_t      tag;
-  uint8_t      u8;
+  //uint8_t    u8;
   uint16_t     u16;
   uint32_t     u32;
-  uint32_t     u64;
+  //uint32_t   u64;
   static char   tmpbuf[1024];
 
   if (!deserialize_untagged_u8(&tag, sb))