diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 17:12:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 17:12:05 -0700 |
| commit | b63e8cf03236257730680adfd75378daf3f5c153 (patch) | |
| tree | 0cb65a8bc2e2d8e8ed9ea6c880f991c4eed4e299 /gr-analog | |
| parent | e4783ab3f1541d8ba32c0269eb30b7c06d0888c2 (diff) | |
| parent | 1d537a26b27b9d3ce6a3affc6ea500a9efc5a867 (diff) | |
Merge branch 'next' into python3
Conflicts:
gnuradio-runtime/python/gnuradio/gr/tag_utils.py
Diffstat (limited to 'gr-analog')
| -rw-r--r-- | gr-analog/lib/agc3_cc_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc index fddefd6710..9d34c7b84d 100644 --- a/gr-analog/lib/agc3_cc_impl.cc +++ b/gr-analog/lib/agc3_cc_impl.cc @@ -79,7 +79,7 @@ namespace gr { #else // Compute a linear average on reset (no expected) if(!d_reset) { - std::vector<float> mags(noutput_items); + _declspec(align(16)) std::vector<float> mags(noutput_items) ; volk_32fc_magnitude_32f(&mags[0], &in[0], noutput_items); #endif float mag(0.0); @@ -104,8 +104,8 @@ namespace gr { else { // Otherwise perform a normal iir update #ifdef _MSC_VER - std::vector<float> mag_sq(noutput_items/d_iir_update_decim); - std::vector<float> inv_mag(noutput_items/d_iir_update_decim); + __declspec(align(16)) std::vector<float> mag_sq(noutput_items/d_iir_update_decim) ; + __declspec(align(16)) std::vector<float> inv_mag(noutput_items/d_iir_update_decim) ; #else float mag_sq[noutput_items/d_iir_update_decim] __attribute__ ((aligned (16))); float inv_mag[noutput_items/d_iir_update_decim] __attribute__ ((aligned (16))); @@ -123,8 +123,8 @@ namespace gr { // apply updates for(int i=0; i<noutput_items/d_iir_update_decim; i++){ float magi = inv_mag[i]; -#ifdef _MSC_VER - if(!_finite(magi)){ +#if defined(_MSC_VER) && _MSC_VER < 1900 + if(!_finite(magi)){ #else if(std::isfinite(magi)){ #endif |