From 3af1dbe0db2b06f794e5dc3efacb620cf7b95299 Mon Sep 17 00:00:00 2001
From: Max <ikj1234i@yahoo.com>
Date: Sun, 5 Jun 2022 14:56:27 -0400
Subject: [PATCH] class variable naming conflict

---
 op25/gr-op25/lib/fsk4_demod_ff_impl.cc | 15 ++++++++-------
 op25/gr-op25/lib/fsk4_demod_ff_impl.h  |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/op25/gr-op25/lib/fsk4_demod_ff_impl.cc b/op25/gr-op25/lib/fsk4_demod_ff_impl.cc
index de77acc..582545b 100644
--- a/op25/gr-op25/lib/fsk4_demod_ff_impl.cc
+++ b/op25/gr-op25/lib/fsk4_demod_ff_impl.cc
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <gnuradio/io_signature.h>
+#include <boost/scoped_array.hpp>
 #include "fsk4_demod_ff_impl.h"
 
 /*
@@ -186,7 +187,7 @@ namespace gr {
 		  gr::io_signature::make(1, 1, sizeof(float)),
 		  gr::io_signature::make(1, 1, sizeof(float))),
 	d_block_rate(sample_rate_Hz / symbol_rate_Hz),
-	d_history(new float[NTAPS]),
+	my_d_history(new float[NTAPS]),
 	d_history_last(0),
 	d_queue(queue),
 	d_symbol_clock(0.0),
@@ -196,7 +197,7 @@ namespace gr {
       fine_frequency_correction = 0.0;
       coarse_frequency_correction = 0.0;
 
-      std::fill(&d_history[0], &d_history[NTAPS], 0.0);
+      std::fill(&my_d_history[0], &my_d_history[NTAPS], 0.0);
     }
 
     /*
@@ -269,7 +270,7 @@ namespace gr {
     {
       d_symbol_clock += d_symbol_time;
       
-      d_history[d_history_last++] = input;
+      my_d_history[d_history_last++] = input;
       d_history_last %= NTAPS;
       
       if(d_symbol_clock > 1.0) {
@@ -296,8 +297,8 @@ namespace gr {
 	double interp = 0.0;
 	double interp_p1 = 0.0;
 	for(size_t i = 0, j = d_history_last; i < NTAPS; ++i) {
-	  interp += TAPS[imu][i] * d_history[j];
-	  interp_p1 += TAPS[imu_p1][i] * d_history[j];
+	  interp += TAPS[imu][i] * my_d_history[j];
+	  interp_p1 += TAPS[imu_p1][i] * my_d_history[j];
 	  j = (j + 1) % NTAPS;
 	}
 #else
@@ -306,8 +307,8 @@ namespace gr {
 	double interp_p1 = 0.0;
 	for(int i=0; i<NTAPS; i++)
 	  {
-	    interp    +=  TAPS[imu   ][i] * d_history[j];
-	    interp_p1 +=  TAPS[imu_p1][i] * d_history[j];
+	    interp    +=  TAPS[imu   ][i] * my_d_history[j];
+	    interp_p1 +=  TAPS[imu_p1][i] * my_d_history[j];
 	    j = (j+1) % NTAPS;
 	  }
 #endif
diff --git a/op25/gr-op25/lib/fsk4_demod_ff_impl.h b/op25/gr-op25/lib/fsk4_demod_ff_impl.h
index e36eb56..063590c 100644
--- a/op25/gr-op25/lib/fsk4_demod_ff_impl.h
+++ b/op25/gr-op25/lib/fsk4_demod_ff_impl.h
@@ -33,7 +33,7 @@ namespace gr {
     {
      private:
       const float d_block_rate;
-      boost::scoped_array<float> d_history;
+      boost::scoped_array<float> my_d_history;
       size_t d_history_last;
       gr::msg_queue::sptr d_queue;
       double d_symbol_clock;