Fix compiler warnings across the tree. Adds --enable-warnings-as-errors configure...

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9396 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/configure.ac b/configure.ac
index 0986a9fdb05af0136b4335e524f35273194fdd9d..14e982b34a9fb78d94733a6dab928ef43b2c82de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,13 @@ LF_CONFIGURE_CC
 LF_CONFIGURE_CXX
 GR_LIB64               dnl check for lib64 suffix after choosing compilers
 
+cxx_warnings_as_errors=""
+AC_ARG_ENABLE(
+    [warnings-as-errors],
+    [--enable-warnings-as-errors Treat compiler warnings as errors],
+    [cxx_warnings_as_errors="-Werror"]    
+)
+
 dnl The three macros above are known to override CXXFLAGS if the user
 dnl didn't specify them.  Though I'm sure somebody thought this was
 dnl a good idea, it makes it hard to use other than -g -O2 when compiling
@@ -50,16 +57,16 @@ dnl the output of swig use use -O1 if we're using g++.
 dnl See Makefile.common for the rest of the magic.
 if test "$user_set_cxxflags" != yes; then
   autoconf_default_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS=""
+  CXXFLAGS=$cxx_warnings_as_errors
   if test "$GXX" = yes; then
     case "$host_cpu" in
        powerpc*)
           dnl "-O1" is broken on the PPC for some reason
           dnl (at least as of g++ 4.1.1)
-          swig_CXXFLAGS="-g1 -O2"
+          swig_CXXFLAGS="-g1 -O2 -fno-strict-aliasing"
        ;;
        *) 
-       swig_CXXFLAGS="-g -O1"
+       swig_CXXFLAGS="-g -O1 -fno-strict-aliasing"
        ;;
     esac
   fi
@@ -246,7 +253,7 @@ GR_SUBVERSION
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
 dnl For -any- checks on $enable_all_components
-dnl use the following guildlines:
+dnl use the following guidelines:
 dnl   yes : --enable-all-components was specified, so error out if any
 dnl         components do not pass configuration checks.
 dnl   no  : --disable-all-components was specified, so try to build the

diff --git a/gnuradio-core/src/lib/bug_work_around_6.cc b/gnuradio-core/src/lib/bug_work_around_6.cc
index 929c7f81dc502a8e6820129f7dc1efdadfcbe671..b829360fca98cb36acf016a69d80173b11f6df17 100644 (file)
--- a/gnuradio-core/src/lib/bug_work_around_6.cc
+++ b/gnuradio-core/src/lib/bug_work_around_6.cc
@@ -1,3 +1,3 @@
 // if libgrio has no sources, it doesn't get built correctly
 
-static int gr_bug_work_around_6;
+static int gr_bug_work_around_6 __attribute__((unused));

diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.cc b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.cc
index 501ae336e84ac6f00a2ac0adee16b6e453862bbf..57850602016e245a543c708f9f7311ddd84e21f4 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.cc
@@ -27,7 +27,7 @@
 #include <gr_adaptive_fir_ccf.h>
 #include <gr_io_signature.h>
 
-gr_adaptive_fir_ccf::gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> &taps)
+gr_adaptive_fir_ccf::gr_adaptive_fir_ccf(const char *name, int decimation, const std::vector<float> &taps)
   : gr_sync_decimator (name,
                       gr_make_io_signature (1, 1, sizeof(gr_complex)),
                       gr_make_io_signature (1, 1, sizeof(gr_complex)),

diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
index 6df0bf5b2f8cde1eacf61f70cd743cd985812396..13d87e765af36ebf585b644adce9b5a8f6c05640 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
@@ -46,7 +46,7 @@ protected:
   virtual void update_tap(float &tap, const gr_complex &in) = 0;
   
 public:
-  gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> &taps);
+  gr_adaptive_fir_ccf(const char *name, int decimation, const std::vector<float> &taps);
   void set_taps(const std::vector<float> &taps);
 
   int work(int noutput_items,

diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
index 1083b181c4e903468acc79650297ef362d5e11ff..5f06a23b9043976c7b31b520f6716924beca3ee2 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
@@ -66,6 +66,7 @@ gr_fft_filter_ccc::~gr_fft_filter_ccc ()
   delete d_invfft;
 }
 
+#if 0
 static void 
 print_vector_complex(const std::string label, const std::vector<gr_complex> &x)
 {
@@ -74,6 +75,7 @@ print_vector_complex(const std::string label, const std::vector<gr_complex> &x)
     std::cout << x[i] << " ";
   std::cout << "\n";
 }
+#endif
 
 void
 gr_fft_filter_ccc::set_taps (const std::vector<gr_complex> &taps)

diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
index 28ee3e07087a326d8db7184adac0aba86d98b69c..dc9b616d9c2b167f8d8f9347a7e06fe564d57aaa 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
@@ -58,6 +58,7 @@ gr_fft_filter_fff::~gr_fft_filter_fff ()
   delete d_invfft;
 }
 
+#if 0
 static void 
 print_vector_complex(const std::string label, const std::vector<gr_complex> &x)
 {
@@ -75,6 +76,7 @@ print_vector_float(const std::string label, const std::vector<float> &x)
     std::cout << x[i] << " ";
   std::cout << "\n";
 }
+#endif
 
 void
 gr_fft_filter_fff::set_taps (const std::vector<float> &taps)

diff --git a/gnuradio-core/src/lib/general/gr_iqcomp_cc.cc b/gnuradio-core/src/lib/general/gr_iqcomp_cc.cc
index 19b81392ed9de875298125fbcb142583f66554b4..e0a2c08ae17e730f4015c05bc3e3895587fd7383 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_iqcomp_cc.cc
+++ b/gnuradio-core/src/lib/general/gr_iqcomp_cc.cc
@@ -40,7 +40,8 @@ gr_iqcomp_cc::gr_iqcomp_cc (float mu)
                   gr_make_io_signature (1, 1, sizeof (gr_complex))),
     d_mu (mu)
 {
-  float d_wi=0.0, d_wq=0.0;
+  d_wi=0.0;
+  d_wq=0.0;
 }
 
 int
@@ -49,7 +50,7 @@ gr_iqcomp_cc::work (int noutput_items,
                   gr_vector_void_star &output_items)
 {
   const gr_complex *iptr = (gr_complex *) input_items[0];
-  gr_complex *optr = (gr_complex *) output_items[0];
+  // gr_complex *optr = (gr_complex *) output_items[0];
 
   for(int i = 0 ; i < noutput_items ; i++) {
     float i_out = iptr[i].real() - iptr[i].imag() * d_wq;

diff --git a/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
index 433b3bc31086e1369692f5afe272d0b72d1f38f3..0f974069ed73720eeba8450ffc5f6cbd34847086 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
+++ b/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
@@ -151,18 +151,20 @@ void gr_ofdm_qam_mapper::make_constellation()
   d_constellation_map[15] = gr_complex(3, 3);
 
   coeff = sqrt(31.0)/2.0;
-  for(i = 0; i < d_constellation_map.size(); i++) {
+  for(i = 0; i < static_cast<int>(d_constellation_map.size()); i++) {
     d_constellation_map[i] /= coeff;
     printf("const[%d]: %f + j%f\n", i, d_constellation_map[i].real(), d_constellation_map[i].imag());
   }
 }
 
+#if 0
 static float
 randombit()
 {
   int r = rand()&1;
   return (float)(-1 + 2*r);
 }
+#endif
 
 int
 gr_ofdm_qam_mapper::work(int noutput_items,

diff --git a/gnuradio-core/src/lib/general/gr_stream_mux.cc b/gnuradio-core/src/lib/general/gr_stream_mux.cc
index 8ba13847132dffcad05df0830f5f75c80f3d97d8..e56974c50e701f4549e7eb25e4f38231f51efbc0 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_stream_mux.cc
+++ b/gnuradio-core/src/lib/general/gr_stream_mux.cc
@@ -86,7 +86,7 @@ gr_stream_mux::general_work(int noutput_items,
     if(VERBOSE) {
       printf("mux: nouput_items: %d   d_stream: %d\n", noutput_items, d_stream);
       for(size_t i = 0; i < d_lengths.size(); i++)
-       printf("\tninput_items[%d]: %d\n", i, ninput_items[i]);
+       printf("\tninput_items[%zu]: %d\n", i, ninput_items[i]);
     }
 
     while (1) {

diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc
index f6e28e1d1e7e055b39decb96b74b3c6f76bf358c..509420d8a85e8c7f4505b110994cb90261a28030 100644 (file)
--- a/gnuradio-core/src/lib/general/gri_fft.cc
+++ b/gnuradio-core/src/lib/general/gri_fft.cc
@@ -37,7 +37,7 @@ static boost::mutex  s_planning_mutex;
 static char *
 wisdom_filename ()
 {
-  static char *filename = ".gr_fftw_wisdom";
+  static const char *filename = ".gr_fftw_wisdom";
 
   char *home = getenv ("HOME");
   if (home){

diff --git a/gnuradio-core/src/lib/general/qa_gr_firdes.cc b/gnuradio-core/src/lib/general/qa_gr_firdes.cc
index 5a41f118a080a57b758548eba1f682759a8a4381..771249b2c59362e338d592b055a6e1f35d7ef9d8 100644 (file)
--- a/gnuradio-core/src/lib/general/qa_gr_firdes.cc
+++ b/gnuradio-core/src/lib/general/qa_gr_firdes.cc
@@ -33,6 +33,7 @@
 
 using std::vector;
 
+#if 0
 static void
 print_taps (std::ostream &s, vector<float> &v)
 {
@@ -41,6 +42,7 @@ print_taps (std::ostream &s, vector<float> &v)
     printf ("tap[%2d] = %16.7e\n", i, v[i]);
   }
 }
+#endif
 
 static void
 check_symmetry (vector<float> &v)

diff --git a/gnuradio-core/src/lib/missing/bug_work_around_8.cc b/gnuradio-core/src/lib/missing/bug_work_around_8.cc
index b79702275c1018cc2c87a63ecefdea656c2ea2dc..b2cbdb3d9e5dc226ab4e86375abe7d4147909c15 100644 (file)
--- a/gnuradio-core/src/lib/missing/bug_work_around_8.cc
+++ b/gnuradio-core/src/lib/missing/bug_work_around_8.cc
@@ -1,2 +1,2 @@
 // if libmisc has no sources, it doesn't get built correctly
-static int gr_bug_work_around_8;
+static int gr_bug_work_around_8 __attribute__((unused));

diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc
index dbd864be5e99291dc01fce3f40eb795550009285..a661e708bb3353c4d6ba1e1c31a800160e3d3538 100644 (file)
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc
+++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc
@@ -88,7 +88,7 @@ atsc_bit_timing_loop::work (int noutput_items,
   // We are tasked with producing output.size output samples.
   // We will consume approximately 2 * output.size input samples.
 
-  unsigned int  k;              // output index
+  int  k;              // output index
 
   float         interp_sample;
   int           symbol_index;

diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/src/lib/atsc_depad.cc
index c72067e6116718a7933d36dae2750ea35366f704..f1e8305686013d29f17e3f4704e767f1e003d368 100644 (file)
--- a/gr-atsc/src/lib/atsc_depad.cc
+++ b/gr-atsc/src/lib/atsc_depad.cc
@@ -51,7 +51,7 @@ atsc_depad::work (int noutput_items,
   const atsc_mpeg_packet *in = (const atsc_mpeg_packet *) input_items[0];
   unsigned char *out = (unsigned char *) output_items[0];
 
-  unsigned int i;
+  int i;
 
   for (i = 0; i < noutput_items/ATSC_MPEG_PKT_LENGTH; i++){
     memcpy(&out[i * ATSC_MPEG_PKT_LENGTH], in[i].data, ATSC_MPEG_PKT_LENGTH);

diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/src/lib/atsc_field_sync_demux.cc
index 333df92fbf60d52a487780352dcee2c3941af277..b6195c6dfe1a90b263bf26e1f88e127ecb85e23d 100644 (file)
--- a/gr-atsc/src/lib/atsc_field_sync_demux.cc
+++ b/gr-atsc/src/lib/atsc_field_sync_demux.cc
@@ -52,8 +52,8 @@ atsc_field_sync_demux::atsc_field_sync_demux()
                  gr_make_io_signature(2, 2, sizeof(float)),
                  gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment))),
                  d_locked(false), d_in_field2(true), d_segment_number(0),
-                 d_next_input(0), d_lost_index(0), d_inputs0_size(0),
-                 d_inputs0_index(0), d_consume(0)
+                 d_next_input(0), d_lost_index(0), d_inputs0_index(0), 
+                  d_inputs0_size(0), d_consume(0)
 {
   reset();
 }
@@ -102,7 +102,7 @@ atsc_field_sync_demux::work (int noutput_items,
 
   assert(sizeof(float) == sizeof(atsc::syminfo));
 
-  int  ii = 0;         // input index
+  unsigned int  ii = 0;         // input index
 
   // Are we in sync?
   if (!tag_is_seg_sync_or_field_sync (input_tags[0])){      // No ...
@@ -155,7 +155,7 @@ atsc_field_sync_demux::work (int noutput_items,
 
   while (k < noutput_items){
 
-    if (d_inputs0_size - ii <  ATSC_DATA_SEGMENT_LENGTH){
+    if (d_inputs0_size - ii <  static_cast<unsigned int>(ATSC_DATA_SEGMENT_LENGTH)){
       // We're out of input data.
       cerr << "atsc_field_sync_demux: ran out of input data\n";
       d_next_input += ii;       // update for forecast

diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.cc b/gr-atsc/src/lib/atsc_field_sync_mux.cc
index 4d17fcaf7e3e3de23b55c006a593a8adf4e6951e..526599aed2bd77052eb4186f765a62ed7f6f9e2e 100644 (file)
--- a/gr-atsc/src/lib/atsc_field_sync_mux.cc
+++ b/gr-atsc/src/lib/atsc_field_sync_mux.cc
@@ -162,7 +162,7 @@ atsc_field_sync_mux::work (int noutput_items,
   atsc_data_segment *out = (atsc_data_segment *) output_items[0];
 
   unsigned int index = 0;
-  for (unsigned int outdex = 0; outdex < noutput_items; outdex++){
+  for (int outdex = 0; outdex < noutput_items; outdex++){
 
     assert (in[index].pli.regular_seg_p ());
 

diff --git a/gr-atsc/src/lib/atsc_pad.cc b/gr-atsc/src/lib/atsc_pad.cc
index 17f50e1f80c98240e6114bb9fa772d7029418a17..cd1353e266e54bf0cf195c45634aa058aadff7ce 100644 (file)
--- a/gr-atsc/src/lib/atsc_pad.cc
+++ b/gr-atsc/src/lib/atsc_pad.cc
@@ -61,10 +61,8 @@ atsc_pad::work (int noutput_items,
 {
   const unsigned char *in = (const unsigned char *) input_items[0];
   atsc_mpeg_packet *out = (atsc_mpeg_packet *) output_items[0];
-
-  // size with padding (256)
-  unsigned int ATSC_MPEG_PKT = sizeof(atsc_mpeg_packet);
-  unsigned int i;
+  
+  int i;
 
   for (i = 0; i < noutput_items; i++){
     for (int j = 0; j < ATSC_MPEG_PKT_LENGTH; j++)

diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.cc b/gr-atsc/src/lib/atsci_equalizer_lms.cc
index 723a5d37ddf0c7a96ae905d515b8a0e135eca962..6358b5334c93ee2f8b9425b6ebd76720fb0ad5a2 100644 (file)
--- a/gr-atsc/src/lib/atsci_equalizer_lms.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_lms.cc
@@ -37,7 +37,7 @@ static const int      NPRETAPS = (int) (NTAPS * 0.8); // probably should be either .2
 // the length of the field sync pattern that we know unequivocally
 static const int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63;
 
-static const float *get_data_seg_sync_training_sequence (int offset);
+// static const float *get_data_seg_sync_training_sequence (int offset);
 static int          get_field_sync_training_sequence_length (int offset);
 static const float *get_field_sync_training_sequence (int which_field, int offset);
 
@@ -272,13 +272,14 @@ init_field_sync_common (float *p, int mask)
   assert (i == KNOWN_FIELD_SYNC_LENGTH);
 }
 
-
+#if 0
 static const float *
 get_data_seg_sync_training_sequence (int offset)
 {
   static const float training_data[4] = { +5, -5, -5, +5 };
   return &training_data[offset];
 }
+#endif
 
 static int    
 get_field_sync_training_sequence_length (int offset)

diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
index b8124fa92e73a30c91e975fa03e8bfbc537d2686..345f6209fbb56738c11faabb3ded399e2031dc1f 100644 (file)
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
@@ -38,7 +38,7 @@ static const int      NFBTAPS = 192;
 // the length of the field sync pattern that we know unequivocally
 static const int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63;
 
-static const float *get_data_seg_sync_training_sequence (int offset);
+// static const float *get_data_seg_sync_training_sequence (int offset);
 static int          get_field_sync_training_sequence_length (int offset);
 static const float *get_field_sync_training_sequence (int which_field, int offset);
 
@@ -339,13 +339,14 @@ init_field_sync_common (float *p, int mask)
   assert (i == KNOWN_FIELD_SYNC_LENGTH);
 }
 
-
+#if 0
 static const float *
 get_data_seg_sync_training_sequence (int offset)
 {
   static const float training_data[4] = { +5, -5, -5, +5 };
   return &training_data[offset];
 }
+#endif
 
 static int    
 get_field_sync_training_sequence_length (int offset)

diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index 2b73c7b11f45d1f1f2beb4e6fb23fcc1fadc18fd..742af80b56a0ffdbbdb0e83a6160c159317c8e6f 100644 (file)
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -90,6 +90,8 @@ _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED)
 
+_audio_alsa_la_CXXFLAGS = @swig_CXXFLAGS@
+
 audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc $(LOCAL_IFILES)
 

diff --git a/gr-audio-alsa/src/audio_alsa_sink.cc b/gr-audio-alsa/src/audio_alsa_sink.cc
index ef51f7553eaef4118ef5eb258fa47ffd17c8efb5..fe3f043bf6cfa07cbb7983edbb59dc21a103a7be 100644 (file)
--- a/gr-audio-alsa/src/audio_alsa_sink.cc
+++ b/gr-audio-alsa/src/audio_alsa_sink.cc
@@ -138,7 +138,8 @@ audio_alsa_sink::audio_alsa_sink (int sampling_rate,
   // Specify the access methods we implement
   // For now, we only handle RW_INTERLEAVED...
   snd_pcm_access_mask_t *access_mask;
-  snd_pcm_access_mask_alloca (&access_mask);
+  snd_pcm_access_mask_t **access_mask_ptr = &access_mask; // FIXME: workaround for compiler warning
+  snd_pcm_access_mask_alloca (access_mask_ptr);
   snd_pcm_access_mask_none (access_mask);
   snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_INTERLEAVED);
   // snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_NONINTERLEAVED);

diff --git a/gr-audio-alsa/src/audio_alsa_source.cc b/gr-audio-alsa/src/audio_alsa_source.cc
index c467b8f85ba6d94c952540df22fc89f2460becb3..381e553f54ccaa750c7405e2a4379b2b6a4bd8e1 100644 (file)
--- a/gr-audio-alsa/src/audio_alsa_source.cc
+++ b/gr-audio-alsa/src/audio_alsa_source.cc
@@ -138,7 +138,8 @@ audio_alsa_source::audio_alsa_source (int sampling_rate,
   // Specify the access methods we implement
   // For now, we only handle RW_INTERLEAVED...
   snd_pcm_access_mask_t *access_mask;
-  snd_pcm_access_mask_alloca (&access_mask);
+  snd_pcm_access_mask_t **access_mask_ptr = &access_mask; // FIXME: workaround for compiler warning
+  snd_pcm_access_mask_alloca (access_mask_ptr);
   snd_pcm_access_mask_none (access_mask);
   snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_INTERLEAVED);
   // snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_NONINTERLEAVED);

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 199382f526c74e0ed7e8aae2a7a18667e2c76593..974dad7b520cff8e3d1c20c435a9f5c27a048ab1 100644 (file)
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -80,6 +80,8 @@ _audio_jack_la_LIBADD =               \
 
 _audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_audio_jack_la_CXXFLAGS = @swig_CXXFLAGS@
+
 audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $(LOCAL_IFILES)
 

diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index 621aae1685f6f963ff5062944d02d2fa1f88015b..abb08e39ace8b100fad359a5199687c796963b6f 100644 (file)
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -75,6 +75,8 @@ _audio_oss_la_LIBADD =                        \
 
 _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_audio_oss_la_CXXFLAGS = @swig_CXXFLAGS@
+
 audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc $(LOCAL_IFILES)
 

diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am
index 6bfbaa4e676369e951f132ec0bd68916f73a7f91..f6952965794919b3f959583e128cde25cee53b29 100644 (file)
--- a/gr-audio-osx/src/Makefile.am
+++ b/gr-audio-osx/src/Makefile.am
@@ -79,6 +79,8 @@ _audio_osx_la_LIBADD =                        \
 
 _audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework AudioUnit -framework CoreAudio -framework AudioToolbox
 
+_audio_osx_la_CXXFLAGS = @swig_CXXFLAGS@
+
 audio_osx.cc audio_osx.py: $(ALL_IFILES)
        $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_osx -o audio_osx.cc $(LOCAL_IFILES)
 

diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index fc00b7e26614f3c77e0df319efe32b29280f6699..f0bd3b19687f86cc0f33cac4ce9fca6494e28294 100644 (file)
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -81,6 +81,8 @@ _audio_portaudio_la_LIBADD =          \
 
 _audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_audio_portaudio_la_CXXFLAGS = @swig_CXXFLAGS@
+
 audio_portaudio.cc audio_portaudio.py: $(ALL_IFILES) audio_portaudio_sink.h audio_portaudio_source.h
        $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc $(LOCAL_IFILES)
 

diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index 3dc30da17e96f74c5c64b69805da4083150d988a..2f5c26c6a88da6ea52d665f48e4b57410cad2126 100644 (file)
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -77,6 +77,8 @@ _audio_windows_la_LIBADD =            \
 _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
                             $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
 
+_audio_windows_la_CXXFLAGS = @swig_CXXFLAGS@
+
 audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
        $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc $(LOCAL_IFILES)
 

diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index 00e14c77c01e8b070d789acdfa3868b2a6083968..6fc02899811ef3abbe18c8a7197823fba54f0912 100644 (file)
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -82,6 +82,8 @@ _comedi_la_LIBADD =           \
 
 _comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_comedi_la_CXXFLAGS = @swig_CXXFLAGS@
+
 comedi.cc comedi.py: $(LOCAL_IFILES)
        $(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $(LOCAL_IFILES)
 

diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
index 402a10eedebd87409b3def359495bca5c2458766..c4f1fac39cb11c9541ef0ec04e2be522c5210391 100644 (file)
--- a/gr-cvsd-vocoder/src/lib/Makefile.am
+++ b/gr-cvsd-vocoder/src/lib/Makefile.am
@@ -73,6 +73,8 @@ _cvsd_vocoder_la_LIBADD =     \
        $(GNURADIO_CORE_LA)     \
        -lstdc++                        
 
+_cvsd_vocoder_la_CXXFLAGS = @swig_CXXFLAGS@
+
 cvsd_vocoder.cc cvsd_vocoder.py: cvsd_vocoder.i $(ALL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module cvsd_vocoder -o cvsd_vocoder.cc $(LOCAL_IFILES)
 

diff --git a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc b/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
index 6b44c57e5f9231df759ea5da9cc7da0f042788af..1dad15d430467dc9372889ccc37409234db83f80 100644 (file)
--- a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
+++ b/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
@@ -64,12 +64,8 @@ cvsd_decode_bs::cvsd_decode_bs (short min_step, short max_step, double step_deca
     d_stepsize(min_step)
   
 {
-  assert(d_pos_accum_max <= SHRT_MAX);
-  assert(d_neg_accum_max >= -SHRT_MAX);
   assert(d_K <= 32);
   assert(d_J <= d_K);
-  
-  // nothing else required in this example
 }
 
 

diff --git a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc b/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
index c2d13d19bc3748a65a55516830b6837c215c96a2..561b91c6863b24fd1065a837b995127042fe5785 100644 (file)
--- a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
+++ b/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
@@ -63,12 +63,8 @@ cvsd_encode_sb::cvsd_encode_sb (short min_step, short max_step, double step_deca
     d_stepsize(min_step)
 
 {
-  assert(d_pos_accum_max <= SHRT_MAX);
-  assert(d_neg_accum_max >= -SHRT_MAX);
   assert(d_K <= 32);
   assert(d_J <= d_K);
-
-  // nothing else required in this example
 }
 
 

diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
index fa929891342601218cd2f1b2f4138c86c0d3a8a5..36b618f4b2c975504d47f0c0b1ac2ca7344edd1d 100644 (file)
--- a/gr-gcell/src/Makefile.am
+++ b/gr-gcell/src/Makefile.am
@@ -93,6 +93,7 @@ _gcell_la_LIBADD = \
 
 _gcell_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_gcell_la_CXXFLAGS = @swig_CXXFLAGS@
 
 swiginclude_HEADERS = \
        $(LOCAL_IFILES)

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index f2f81286fa6fdd887376bf7cc500f8be00d737df..1620d69ffff30cbf184c18f32059bf1a73826ee4 100644 (file)
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -143,6 +143,8 @@ _trellis_la_LIBADD =                        \
        $(GNURADIO_CORE_LA)             \
        -lstdc++
 
+_trellis_la_CXXFLAGS = @swig_CXXFLAGS@
+
 trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)
        $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
 

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 4bb40800f75ea971f2f50dcdb3ccce6177d34c71..03ca34db006f4438651c8a2ee9fd76a99d9e7751 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -108,6 +108,7 @@ _usrp1_la_LIBADD =                  \
 
 _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_usrp1_la_CXXFLAGS = @swig_CXXFLAGS@
 
 usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)

diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index 620287d46bbc362289f8885ba30c5a136e72c6a4..3740022e0ace1342840bc7d4aa5889755445c86f 100644 (file)
--- a/usrp/host/apps/usrper.cc
+++ b/usrp/host/apps/usrper.cc
@@ -71,12 +71,14 @@ usage ()
   exit (1);
 }
 
+#if 0
 static void
 die (const char *msg)
 {
   fprintf (stderr, "%s (die): %s\n", prog_name, msg);
   exit (1);
 }
+#endif
 
 static int 
 hexval (char ch)

diff --git a/usrp/host/lib/legacy/std_paths.h.in b/usrp/host/lib/legacy/std_paths.h.in
index 9c26cfa2326b6508bc327d94237d198e10cf4b65..e09499e0b062d46d995f268e1633648296ace311 100644 (file)
--- a/usrp/host/lib/legacy/std_paths.h.in
+++ b/usrp/host/lib/legacy/std_paths.h.in
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-static char *std_paths[] = {
+static const char *std_paths[] = {
   "@prefix@/share/usrp",
   "/usr/local/share/usrp",
   0

diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/legacy/usrp_prims.cc
index 0034bb31e1b848182acb69d3e22005486d88b8ad..c2f74f5f17db8a43e9ee9526f9e4800074798a53 100644 (file)
--- a/usrp/host/lib/legacy/usrp_prims.cc
+++ b/usrp/host/lib/legacy/usrp_prims.cc
@@ -58,8 +58,8 @@ static const int hash_slot_addr[2] = {
   USRP_HASH_SLOT_1_ADDR
 };
 
-static char *default_firmware_filename = "std.ihx";
-static char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
+static const char *default_firmware_filename = "std.ihx";
+static const char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
 
 #include "std_paths.h"
 #include <stdio.h>
@@ -67,7 +67,7 @@ static char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
 static char *
 find_file (const char *filename, int hw_rev)
 {
-  char **sp = std_paths;
+  const char **sp = std_paths;
   static char path[1000];
   char *s;
 

diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index dc92f2b48525ac228bed01f13059557a1555f1e5..57bc3bdc80050e99498114dd7aebbb4e30072d6b 100644 (file)
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -69,6 +69,7 @@ noinst_HEADERS =
 _usrp_prims_la_LIBADD  = $(USRP_LA) -lstdc++ $(PYTHON_LDFLAGS)
 _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_usrp_prims_la_CXXFLAGS = @swig_CXXFLAGS@
 
 prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
        $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i