diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-11-04 14:11:39 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-11-04 14:11:39 -0800 |
| commit | 466c218e78b8a566bb8e6eb5ed33f95a3409eb29 (patch) | |
| tree | 7102fc010a052a0835a86b7dc97bce08b4fdbc61 | |
| parent | 0993c1b0ad518f66befca0c523c55ddc51a4eb91 (diff) | |
| parent | 539eaca1ae1dd4bd68e529d5bfbf48c3c578537d (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-blocks/lib/endian_swap_impl.h | 1 | ||||
| -rw-r--r-- | gr-blocks/lib/keep_m_in_n_impl.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gr-blocks/lib/endian_swap_impl.h b/gr-blocks/lib/endian_swap_impl.h index ab8fff1b65..de56c52725 100644 --- a/gr-blocks/lib/endian_swap_impl.h +++ b/gr-blocks/lib/endian_swap_impl.h @@ -31,7 +31,6 @@ namespace gr { class endian_swap_impl : public endian_swap { private: - size_t item_size_bytes; public: endian_swap_impl(size_t item_size_bytes); diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h index ffb580bb3a..5531344da6 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.h +++ b/gr-blocks/lib/keep_m_in_n_impl.h @@ -32,7 +32,6 @@ namespace gr { { int d_m; int d_n; - int d_count; int d_offset; int d_itemsize; |