diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
| commit | d97764ce6040aff8023b43323b4bc048a907a1fd (patch) | |
| tree | dda4ba74128454fd271ffe7dcbe673f2ae0b4c08 /gnuradio-core/src/tests/benchmark_dotprod_fcc.cc | |
| parent | b142f64573b8b7b15a94fc9c64e2f26264a5b144 (diff) | |
| parent | bf8700a226091c5ce0130a3819a4c12b9d9981a6 (diff) | |
Merge branch 'master' into my_qtsink
Conflicts:
gr-qtgui/include/qtgui_sink_c.h
gr-qtgui/include/qtgui_sink_f.h
gr-qtgui/include/qtgui_util.h
gr-qtgui/lib/ConstellationDisplayPlot.cc
gr-qtgui/lib/FrequencyDisplayPlot.cc
gr-qtgui/lib/SpectrumGUIClass.cc
gr-qtgui/lib/TimeDomainDisplayPlot.cc
gr-qtgui/lib/WaterfallDisplayPlot.cc
gr-qtgui/lib/qtgui_sink_c.cc
gr-qtgui/lib/qtgui_sink_f.cc
gr-qtgui/lib/spectrumdisplayform.cc
Diffstat (limited to 'gnuradio-core/src/tests/benchmark_dotprod_fcc.cc')
| -rw-r--r-- | gnuradio-core/src/tests/benchmark_dotprod_fcc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/tests/benchmark_dotprod_fcc.cc b/gnuradio-core/src/tests/benchmark_dotprod_fcc.cc index 8363a03b37..e9eeee43a1 100644 --- a/gnuradio-core/src/tests/benchmark_dotprod_fcc.cc +++ b/gnuradio-core/src/tests/benchmark_dotprod_fcc.cc @@ -79,7 +79,7 @@ benchmark (fir_maker_t filter_maker, const char *implementation_name) std::vector<gr_complex> taps (&coeffs[0], &coeffs[NTAPS]); filter_t *f = filter_maker (taps); - + // get starting CPU usage #ifdef HAVE_SYS_RESOURCE_H if (getrusage (RUSAGE_SELF, &rusage_start) < 0){ |