diff options
| author | Josh Blum <josh@joshknows.com> | 2012-11-13 19:32:45 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-14 09:26:56 -0800 |
| commit | 64913ee414f2c8a51afb2277b16b957fa2e7e066 (patch) | |
| tree | 43a3f17d1f25274a48b215b077fd16907a3c460e /gr-filter | |
| parent | b22ff660f8a710aea6e1ca75075d2265478b0465 (diff) | |
filter: use matching free for malloc, fixes access violation
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/lib/fir_filter.cc | 24 | ||||
| -rw-r--r-- | gr-filter/lib/fir_filter_with_buffer.cc | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc index 6137dd2693..d7a0a0c705 100644 --- a/gr-filter/lib/fir_filter.cc +++ b/gr-filter/lib/fir_filter.cc @@ -50,7 +50,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -66,7 +66,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -155,7 +155,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -171,7 +171,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -262,7 +262,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -278,7 +278,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -368,7 +368,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -384,7 +384,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -473,7 +473,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -489,7 +489,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -579,7 +579,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -595,7 +595,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc index 7bff8d4a77..181630d48c 100644 --- a/gr-filter/lib/fir_filter_with_buffer.cc +++ b/gr-filter/lib/fir_filter_with_buffer.cc @@ -60,7 +60,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -81,7 +81,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -213,7 +213,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -234,7 +234,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -366,7 +366,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -387,7 +387,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } |