[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: build: fixing various warning from c
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: build: fixing various warning from clang. |
|
Date: |
Fri, 10 Jan 2014 20:39:57 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch maint
in repository gnuradio.
commit 0eab78e9228d18169ebf2e46ad94bc54314f7e59
Author: Julien Olivain <address@hidden>
Date: Thu Jan 9 22:53:40 2014 -0500
build: fixing various warning from clang.
Addresses iss #586; adapted for current set of warnings after patches since
this issue was posted.
---
gr-atsc/lib/qa_atsci_equalizer_nop.cc | 6 +-
gr-atsc/lib/qa_atsci_viterbi_decoder.cc | 2 +-
gr-blocks/lib/random_pdu_impl.h | 2 +-
gr-blocks/lib/vector_map_impl.cc | 2 +-
gr-fec/lib/reed-solomon/decode_rs.c | 3 +
gr-fec/lib/reed-solomon/init_rs.c | 2 +
gr-qtgui/lib/const_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_f_impl.cc | 2 +-
gr-qtgui/lib/histogram_sink_f_impl.cc | 2 +-
gr-qtgui/lib/sink_c_impl.cc | 2 +-
gr-qtgui/lib/sink_f_impl.cc | 2 +-
gr-qtgui/lib/time_raster_sink_b_impl.cc | 2 +-
gr-qtgui/lib/time_raster_sink_c_impl.cc | 224 --------------------------------
gr-qtgui/lib/time_raster_sink_c_impl.h | 90 -------------
gr-qtgui/lib/time_raster_sink_f_impl.cc | 2 +-
gr-qtgui/lib/time_sink_c_impl.cc | 2 +-
gr-qtgui/lib/time_sink_f_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_f_impl.cc | 2 +-
volk/apps/volk_profile.cc | 2 +-
volk/lib/testqa.cc | 2 +-
22 files changed, 25 insertions(+), 334 deletions(-)
diff --git a/gr-atsc/lib/qa_atsci_equalizer_nop.cc
b/gr-atsc/lib/qa_atsci_equalizer_nop.cc
index 098d745..b7aad83 100644
--- a/gr-atsc/lib/qa_atsci_equalizer_nop.cc
+++ b/gr-atsc/lib/qa_atsci_equalizer_nop.cc
@@ -200,9 +200,9 @@ qa_atsci_equalizer_nop::t0 ()
try {
- memset (input_data, 0, sizeof (input_data));
- memset (input_tags, 0, sizeof (input_tags));
- memset (output_data, 0, sizeof (output_data));
+ memset (input_data, 0, sizeof(*input_data)*INPUT_SIZE);
+ memset (input_tags, 0, sizeof(*input_tags)*INPUT_SIZE);
+ memset (output_data, 0, sizeof(*output_data)*INPUT_SIZE);
setup_test_data (input_data, input_tags);
diff --git a/gr-atsc/lib/qa_atsci_viterbi_decoder.cc
b/gr-atsc/lib/qa_atsci_viterbi_decoder.cc
index cd19804..7f72b22 100644
--- a/gr-atsc/lib/qa_atsci_viterbi_decoder.cc
+++ b/gr-atsc/lib/qa_atsci_viterbi_decoder.cc
@@ -51,7 +51,7 @@ map_to_soft_symbols (atsc_soft_data_segment &out,
static void
pad_decoder_input (atsc_soft_data_segment out[NCODERS])
{
- memset (out, 0, sizeof (out));
+ memset(out, 0, sizeof(*out)*NCODERS);
// add data segment sync
for (int i = 0; i < NCODERS; i++){
diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h
index 77e7bdd..7d8aa23 100644
--- a/gr-blocks/lib/random_pdu_impl.h
+++ b/gr-blocks/lib/random_pdu_impl.h
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
+#ifndef INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H
#define INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H
#include <gnuradio/blocks/random_pdu.h>
diff --git a/gr-blocks/lib/vector_map_impl.cc b/gr-blocks/lib/vector_map_impl.cc
index d50dcb5..05a3201 100644
--- a/gr-blocks/lib/vector_map_impl.cc
+++ b/gr-blocks/lib/vector_map_impl.cc
@@ -90,7 +90,7 @@ namespace gr {
if(s >= d_in_vlens.size()) {
throw std::runtime_error("Stream numbers in mapping must be less
than the number of input streams.");
}
- if((index < 0) || (index >= d_in_vlens[s])) {
+ if(index >= d_in_vlens[s]) {
throw std::runtime_error ("Indices in mapping must be greater than
0 and less than the input vector lengths.");
}
}
diff --git a/gr-fec/lib/reed-solomon/decode_rs.c
b/gr-fec/lib/reed-solomon/decode_rs.c
index f9438cf..9de22c8 100644
--- a/gr-fec/lib/reed-solomon/decode_rs.c
+++ b/gr-fec/lib/reed-solomon/decode_rs.c
@@ -9,7 +9,10 @@
#include <string.h>
+#ifndef NULL
#define NULL ((void *)0)
+#endif
+
#define min(a,b) ((a) < (b) ? (a) : (b))
#ifdef FIXED
diff --git a/gr-fec/lib/reed-solomon/init_rs.c
b/gr-fec/lib/reed-solomon/init_rs.c
index 4ec77cd..f50592b 100644
--- a/gr-fec/lib/reed-solomon/init_rs.c
+++ b/gr-fec/lib/reed-solomon/init_rs.c
@@ -13,7 +13,9 @@
#include "char.h"
#endif
+#ifndef NULL
#define NULL ((void *)0)
+#endif
void FREE_RS(void *p){
struct rs *rs = (struct rs *)p;
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc
b/gr-qtgui/lib/const_sink_c_impl.cc
index c4651fc..3fda1ed 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -60,7 +60,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index c210278..03401a7 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -66,7 +66,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index e3baeb0..a673e18 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -66,7 +66,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc
b/gr-qtgui/lib/histogram_sink_f_impl.cc
index 843571a..bc4ac84 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -63,7 +63,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index 55ccb4a..ddeabf8 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -70,7 +70,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index ce26d6b..63f4b55 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -70,7 +70,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc
b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index dcf21a6..078603d 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -72,7 +72,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.cc
b/gr-qtgui/lib/time_raster_sink_c_impl.cc
deleted file mode 100644
index 9bfa98a..0000000
--- a/gr-qtgui/lib/time_raster_sink_c_impl.cc
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "time_raster_sink_c_impl.h"
-#include <gnuradio/io_signature.h>
-#include <string.h>
-#include <volk/volk.h>
-
-namespace gr {
- namespace qtgui {
-
- time_raster_sink_c::sptr
- time_raster_sink_c::make(unsignedint rows,
- unsigned int cols,
- const std::string &name,
- QWidget *parent)
- {
- return gnuradio::get_initial_sptr
- (new time_raster_sink_c_impl(rows, cols,
- name, parent));
- }
-
- time_raster_sink_c_impl::time_raster_sink_c_impl(unsignedint rows,
- unsigned int cols,
- const std::string &name,
- QWidget *parent)
- : sync_block("time_raster_sink_c",
- io_signature::make(1, -1, sizeof(gr_complex)),
- io_signature::make(0, 0, 0)),
- d_name(name), d_nconnections(1), d_parent(parent),
- d_rows(rows), d_cols(cols)
- {
- d_main_gui = NULL;
-
- d_index = 0;
- for(int i = 0; i < d_nconnections; i++) {
- d_residbufs.push_back(fft::malloc_complex(rows));
- memset(d_residbufs[i], 0, rows*sizeof(float));
- }
-
- initialize();
- }
-
- time_raster_sink_c_impl::~time_raster_sink_c_impl()
- {
- if(!d_main_gui->isClosed())
- d_main_gui->close();
-
- for(int i = 0; i < d_nconnections; i++) {
- fft::free(d_residbufs[i]);
- }
- }
-
- void
- time_raster_sink_c_impl::forecast(int noutput_items, gr_vector_int
&ninput_items_required)
- {
- unsigned int ninputs = ninput_items_required.size();
- for (unsigned int i = 0; i < ninputs; i++) {
- ninput_items_required[i] = std::min(d_rows, 8191);
- }
- }
-
- void
- time_raster_sink_c_impl::initialize()
- {
- if(qApp != NULL) {
- d_qApplication = qApp;
- }
- else {
- int argc = 0;
- char **argv = NULL;
- d_qApplication = new QApplication(argc, argv);
- }
-
- d_main_gui = new TimeRasterDisplayForm(d_nconnections, d_rows, d_cols,
d_parent);
-
- // initialize update time to 10 times a second
- set_update_time(0.1);
- d_last_time = 0;
- }
-
- void
- time_raster_sink_c_impl::exec_()
- {
- d_qApplication->exec();
- }
-
- QWidget*
- time_raster_sink_c_impl::qwidget()
- {
- return d_main_gui;
- }
-
-#ifdef ENABLE_PYTHON
- PyObject*
- time_raster_sink_c_impl::pyqwidget()
- {
- PyObject *w = PyLong_FromVoidPtr((void*)d_main_gui);
- PyObject *retarg = Py_BuildValue("N", w);
- return retarg;
- }
-#endif
-
- void
- time_raster_sink_c_impl::set_update_time(double t)
- {
- //convert update time to ticks
- gr::high_res_timer_type tps = gr::high_res_timer_tps();
- d_update_time = t * tps;
- d_main_gui->setUpdateTime(t);
- }
-
- void
- time_raster_sink_c_impl::set_title(const std::string &title)
- {
- d_main_gui->setTitle(title.c_str());
- }
-
- void
- time_raster_sink_c_impl::set_line_label(const std::string &label)
- {
- d_main_gui->setLineLabel(0, label.c_str());
- }
-
- void
- time_raster_sink_c_impl::set_line_color(const std::string &color)
- {
- d_main_gui->setLineColor(0, color.c_str());
- }
-
- void
- time_raster_sink_c_impl::set_line_width(int width)
- {
- d_main_gui->setLineWidth(0, width);
- }
-
- void
- time_raster_sink_c_impl::set_line_style(Qt::PenStyle style)
- {
- d_main_gui->setLineStyle(0, style);
- }
-
- void
- time_raster_sink_c_impl::set_line_marker(QwtSymbol::Style marker)
- {
- d_main_gui->setLineMarker(0, marker);
- }
-
- void
- time_raster_sink_c_impl::set_size(int width, int height)
- {
- d_main_gui->resize(QSize(width, height));
- }
-
- int
- time_raster_sink_c_impl::work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
- {
- int j=0;
- const gr_complex *in = (const gr_complex*)input_items[0];
-
- for(int i=0; i < noutput_items; i+=d_cols) {
- unsigned int datasize = noutput_items - i;
- unsigned int resid = d_cols-d_index;
-
- // If we have enough input for one full column
- if(datasize >= resid) {
-
- for(int n = 0; n < d_nconnections; n++) {
- in = (const gr_complex*)input_items[n];
- memcpy(d_residbufs[n]+d_index, &in[j], sizeof(gr_complex)*resid);
- }
-
- if(gr::high_res_timer_now() - d_last_time > d_update_time) {
- d_last_time = gr::high_res_timer_now();
- d_qApplication->postEvent(d_main_gui,
- new TimeRasterUpdateEvent(d_residbufs,
- d_fftsize,
- d_last_time));
- }
-
- d_index = 0;
- j += resid;
- }
- // Otherwise, copy what we received into the residbuf for next time
- else {
- for(int n = 0; n < d_nconnections; n++) {
- in = (const gr_complex*)input_items[n];
- memcpy(d_residbufs[n]+d_index, &in[j], sizeof(gr_complex)*datasize);
- }
- d_index += datasize;
- j += datasize;
- }
- }
-
- return j;
- }
-
- } /* namespace qtgui */
-} /* namespace gr */
diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h
b/gr-qtgui/lib/time_raster_sink_c_impl.h
deleted file mode 100644
index b9efea2..0000000
--- a/gr-qtgui/lib/time_raster_sink_c_impl.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012,2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H
-#define INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H
-
-#include <gnuradio/qtgui/time_raster_sink_c.h>
-#include <gnuradio/filter/firdes.h>
-#include <gnuradio/fft/fft.h>
-#include <gnuradio/high_res_timer.h>
-#include <gnuradio/thread/thread.h>
-#include <gnuradio/qtgui/time_rasterdisplayform.h>
-
-namespace gr {
- namespace qtgui {
-
- class QTGUI_API time_raster_sink_c_impl : public time_raster_sink_c
- {
- private:
- void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-
- void initialize();
-
- std::string d_name;
- int d_nconnections;
-
- int d_index;
- std::vector<gr_complex*> d_residbufs;
- float *d_fbuf;
-
- QWidget *d_parent;
- TimeRasterDisplayForm *d_main_gui;
-
- unsigned int d_rows, d_cols;
-
- gr::high_res_timer_type d_update_time;
- gr::high_res_timer_type d_last_time;
-
- public:
- time_raster_sink_c_impl(unsignedint rows,
- unsigned int cols,
- const std::string &name,
- QWidget *parent=NULL);
- ~time_raster_sink_c_impl();
-
- void exec_();
- QWidget* qwidget();
-
-#ifdef ENABLE_PYTHON
- PyObject* pyqwidget();
-#endif
-
- void set_update_time(double t);
- void set_title(const std::string &title);
- void set_line_label(const std::string &label);
- void set_line_color(const std::string &color);
- void set_line_width(int width);
- void set_line_style(Qt::PenStyle style);
- void set_line_marker(QwtSymbol::Style marker);
-
- void set_size(int width, int height);
-
- int work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
- };
-
- } /* namespace qtgui */
-} /* namespace gr */
-
-#endif /* INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H */
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc
b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index 014c981..6052d75 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -72,7 +72,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 7eb1dd5..82aba02 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -60,7 +60,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index 0c8e765..afb07e3 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -62,7 +62,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index ee74f96..24983cd 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -66,7 +66,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index 3be4f14..d4cfee3 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -65,7 +65,7 @@ namespace gr {
// http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
d_argc = 1;
d_argv = new char;
- d_argv = '\0';
+ d_argv[0] = '\0';
d_main_gui = NULL;
diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc
index 3de6f23..a857d26 100644
--- a/volk/apps/volk_profile.cc
+++ b/volk/apps/volk_profile.cc
@@ -60,7 +60,7 @@ int main(int argc, char *argv[]) {
VOLK_PROFILE(volk_32fc_x2_multiply_conjugate_32fc, 1e-4, 0, 204602, 1000,
&results);
VOLK_PROFILE(volk_32fc_conjugate_32fc, 1e-4, 0, 204602, 1000, &results);
VOLK_PROFILE(volk_32f_s32f_convert_16i, 1, 32768, 204602, 10000, &results);
- VOLK_PROFILE(volk_32f_s32f_convert_32i, 1, 2<<31, 204602, 10000, &results);
+ VOLK_PROFILE(volk_32f_s32f_convert_32i, 1, 1<<31, 204602, 10000, &results);
VOLK_PROFILE(volk_32f_convert_64f, 1e-4, 0, 204602, 10000, &results);
VOLK_PROFILE(volk_32f_s32f_convert_8i, 1, 128, 204602, 10000, &results);
//VOLK_PROFILE(volk_32fc_s32f_x2_power_spectral_density_32f, 1e-4, 2046,
10000, &results);
diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc
index c8d54ff..6408e1e 100644
--- a/volk/lib/testqa.cc
+++ b/volk/lib/testqa.cc
@@ -39,7 +39,7 @@ VOLK_RUN_TESTS(volk_32fc_index_max_16u, 3, 0, 20462, 1);
VOLK_RUN_TESTS(volk_32fc_s32f_magnitude_16i, 1, 32768, 20462, 1);
VOLK_RUN_TESTS(volk_32fc_magnitude_32f, 1e-4, 0, 20462, 1);
VOLK_RUN_TESTS(volk_32f_s32f_convert_16i, 1, 32768, 20462, 1);
-VOLK_RUN_TESTS(volk_32f_s32f_convert_32i, 1, 2<<31, 20462, 1);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_32i, 1, 1<<31, 20462, 1);
VOLK_RUN_TESTS(volk_32f_convert_64f, 1e-4, 0, 20462, 1);
VOLK_RUN_TESTS(volk_32f_s32f_convert_8i, 1, 128, 20462, 1);
//VOLK_RUN_TESTS(volk_32fc_s32f_x2_power_spectral_density_32f, 1e-4, 2046,
10000);