filter: changing name of moving average class to remove name conflicts.

2 files changed, 16 insertions, 16 deletions

diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.cc b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.cc
index 66f59f240..e7d5ced25 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.cc
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.cc
@@ -28,18 +28,18 @@
 #include <gr_io_signature.h>
 #include <cstdio>
 
-moving_averager::moving_averager(int D)
+moving_averager_c::moving_averager_c(int D)
   : d_length(D), d_out(0), d_out_d1(0), d_out_d2(0)
 {
   d_delay_line = std::deque<gr_complex>(d_length-1, gr_complex(0,0));
 }
 
-moving_averager::~moving_averager()
+moving_averager_c::~moving_averager_c()
 {
 }
 
 gr_complex
-moving_averager::filter(gr_complex x)
+moving_averager_c::filter(gr_complex x)
 {
   d_out_d1 = d_out;
   d_delay_line.push_back(x);
@@ -67,15 +67,15 @@ gr_dc_blocker_cc::gr_dc_blocker_cc (int D, bool long_form)
     d_length(D), d_long_form(long_form)
 {
   if(d_long_form) {
-    d_ma_0 = new moving_averager(D);
-    d_ma_1 = new moving_averager(D);
-    d_ma_2 = new moving_averager(D);
-    d_ma_3 = new moving_averager(D);
+    d_ma_0 = new moving_averager_c(D);
+    d_ma_1 = new moving_averager_c(D);
+    d_ma_2 = new moving_averager_c(D);
+    d_ma_3 = new moving_averager_c(D);
     d_delay_line = std::deque<gr_complex>(d_length-1, gr_complex(0,0));
   }
   else {
-    d_ma_0 = new moving_averager(D);
-    d_ma_1 = new moving_averager(D);
+    d_ma_0 = new moving_averager_c(D);
+    d_ma_1 = new moving_averager_c(D);
   }
 }
 
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
index 26a2247ea..8e6164cbd 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
@@ -56,11 +56,11 @@ gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D=32, bool long_form=true);
  *    <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine,
  *        Mar. 2008, pp 132-134.</EM></B>
  */
-class moving_averager
+class moving_averager_c
 {
 public:
-  moving_averager(int D);
-  ~moving_averager();
+  moving_averager_c(int D);
+  ~moving_averager_c();
 
   gr_complex filter(gr_complex x);
   gr_complex delayed_sig() { return d_out; }
@@ -84,10 +84,10 @@ class gr_dc_blocker_cc : public gr_sync_block
 
   int d_length;
   bool d_long_form;
-  moving_averager *d_ma_0;
-  moving_averager *d_ma_1;
-  moving_averager *d_ma_2;
-  moving_averager *d_ma_3;
+  moving_averager_c *d_ma_0;
+  moving_averager_c *d_ma_1;
+  moving_averager_c *d_ma_2;
+  moving_averager_c *d_ma_3;
   std::deque<gr_complex> d_delay_line;
 
   gr_dc_blocker_cc (int D, bool long_form);