Write public interface first, then private members in class definitions

src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h

@@ -38,9 +38,10 @@
 class direct_resampler_conditioner_cb;
 using direct_resampler_conditioner_cb_sptr = boost::shared_ptr<direct_resampler_conditioner_cb>;
 
-direct_resampler_conditioner_cb_sptr
-direct_resampler_make_conditioner_cb(double sample_freq_in,
+direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
+    double sample_freq_in,
     double sample_freq_out);
+
 /*!
  * \brief This class implements a direct resampler conditioner for std::complex<signed char>
  *
@@ -48,20 +49,6 @@ direct_resampler_make_conditioner_cb(double sample_freq_in,
  */
 class direct_resampler_conditioner_cb : public gr::block
 {
-private:
-    friend direct_resampler_conditioner_cb_sptr
-    direct_resampler_make_conditioner_cb(double sample_freq_in,
-        double sample_freq_out);
-
-    double d_sample_freq_in;
-    double d_sample_freq_out;
-    uint32_t d_phase;
-    uint32_t d_lphase;
-    uint32_t d_phase_step;
-
-    direct_resampler_conditioner_cb(double sample_freq_in,
-        double sample_freq_out);
-
 public:
     ~direct_resampler_conditioner_cb();
 
@@ -80,6 +67,21 @@ public:
     int general_work(int noutput_items, gr_vector_int &ninput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
+        double sample_freq_in,
+        double sample_freq_out);
+
+    direct_resampler_conditioner_cb(
+        double sample_freq_in,
+        double sample_freq_out);
+
+    double d_sample_freq_in;
+    double d_sample_freq_out;
+    uint32_t d_phase;
+    uint32_t d_lphase;
+    uint32_t d_phase_step;
 };
 
 #endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H */

src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h

@@ -43,9 +43,11 @@
 #include <volk/volk.h>
 
 class direct_resampler_conditioner_cc;
+
 using direct_resampler_conditioner_cc_sptr = boost::shared_ptr<direct_resampler_conditioner_cc>;
-direct_resampler_conditioner_cc_sptr
-direct_resampler_make_conditioner_cc(double sample_freq_in,
+
+direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
+    double sample_freq_in,
     double sample_freq_out);
 
 /*!
@@ -55,18 +57,6 @@ direct_resampler_make_conditioner_cc(double sample_freq_in,
  */
 class direct_resampler_conditioner_cc : public gr::block
 {
-private:
-    friend direct_resampler_conditioner_cc_sptr
-    direct_resampler_make_conditioner_cc(double sample_freq_in,
-        double sample_freq_out);
-    double d_sample_freq_in;   //! Specifies the sampling frequency of the input signal
-    double d_sample_freq_out;  //! Specifies the sampling frequency of the output signal
-    uint32_t d_phase;
-    uint32_t d_lphase;
-    uint32_t d_phase_step;
-    direct_resampler_conditioner_cc(double sample_freq_in,
-        double sample_freq_out);
-
 public:
     ~direct_resampler_conditioner_cc();
     inline unsigned int sample_freq_in() const
@@ -84,6 +74,21 @@ public:
     int general_work(int noutput_items, gr_vector_int &ninput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
+        double sample_freq_in,
+        double sample_freq_out);
+
+    direct_resampler_conditioner_cc(
+        double sample_freq_in,
+        double sample_freq_out);
+
+    double d_sample_freq_in;   // Sampling frequency of the input signal
+    double d_sample_freq_out;  // Sampling frequency of the output signal
+    uint32_t d_phase;
+    uint32_t d_lphase;
+    uint32_t d_phase_step;
 };
 
 #endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H */

src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h

@@ -38,9 +38,10 @@
 class direct_resampler_conditioner_cs;
 using direct_resampler_conditioner_cs_sptr = boost::shared_ptr<direct_resampler_conditioner_cs>;
 
-direct_resampler_conditioner_cs_sptr
-direct_resampler_make_conditioner_cs(double sample_freq_in,
+direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
+    double sample_freq_in,
     double sample_freq_out);
+
 /*!
  * \brief This class implements a direct resampler conditioner for std::complex<short>
  *
@@ -48,20 +49,6 @@ direct_resampler_make_conditioner_cs(double sample_freq_in,
  */
 class direct_resampler_conditioner_cs : public gr::block
 {
-private:
-    friend direct_resampler_conditioner_cs_sptr
-    direct_resampler_make_conditioner_cs(double sample_freq_in,
-        double sample_freq_out);
-
-    double d_sample_freq_in;
-    double d_sample_freq_out;
-    uint32_t d_phase;
-    uint32_t d_lphase;
-    uint32_t d_phase_step;
-
-    direct_resampler_conditioner_cs(double sample_freq_in,
-        double sample_freq_out);
-
 public:
     ~direct_resampler_conditioner_cs();
 
@@ -80,6 +67,21 @@ public:
     int general_work(int noutput_items, gr_vector_int &ninput_items,
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items);
+
+private:
+    friend direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
+        double sample_freq_in,
+        double sample_freq_out);
+
+    direct_resampler_conditioner_cs(
+        double sample_freq_in,
+        double sample_freq_out);
+
+    double d_sample_freq_in;
+    double d_sample_freq_out;
+    uint32_t d_phase;
+    uint32_t d_lphase;
+    uint32_t d_phase_step;
 };
 
 #endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H */