summaryrefslogtreecommitdiff
path: root/gr-filter
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2012-06-20 18:51:29 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2012-06-22 08:52:54 -0700
commit85fc01d1715e40da147e4c5dbff0c7edd2f315d4 (patch)
treeaed4902c72fb72ab1adfa1b0daac6b173861f4a4 /gr-filter
parent62f7129ed20d2a5c13e3b90c399be9d6ad1cb5c8 (diff)
gr-filter: Removing FILTER_API from internals static members fixes Windows error
Diffstat (limited to 'gr-filter')
-rw-r--r--gr-filter/include/filter/adaptive_fir_ccc.h2
-rw-r--r--gr-filter/include/filter/adaptive_fir_ccf.h2
-rw-r--r--gr-filter/include/filter/channel_model.h2
-rw-r--r--gr-filter/include/filter/dc_blocker_cc.h2
-rw-r--r--gr-filter/include/filter/dc_blocker_ff.h2
-rw-r--r--gr-filter/include/filter/fft_filter_ccc.h2
-rw-r--r--gr-filter/include/filter/fft_filter_fff.h2
-rw-r--r--gr-filter/include/filter/filter_delay_fc.h2
-rw-r--r--gr-filter/include/filter/fir_filter_XXX.h.t2
-rw-r--r--gr-filter/include/filter/fractional_interpolator_cc.h2
-rw-r--r--gr-filter/include/filter/fractional_interpolator_ff.h2
-rw-r--r--gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t2
-rw-r--r--gr-filter/include/filter/hilbert_fc.h2
-rw-r--r--gr-filter/include/filter/iir_filter_ffd.h2
-rw-r--r--gr-filter/include/filter/interp_fir_filter_XXX.h.t2
-rw-r--r--gr-filter/include/filter/pfb_arb_resampler_ccf.h2
-rw-r--r--gr-filter/include/filter/pfb_arb_resampler_fff.h2
-rw-r--r--gr-filter/include/filter/pfb_channelizer_ccf.h2
-rw-r--r--gr-filter/include/filter/pfb_decimator_ccf.h2
-rw-r--r--gr-filter/include/filter/pfb_interpolator_ccf.h2
-rw-r--r--gr-filter/include/filter/pfb_synthesizer_ccf.h2
-rw-r--r--gr-filter/include/filter/rational_resampler_base_XXX.h.t2
-rw-r--r--gr-filter/include/filter/single_pole_iir_filter_cc.h2
-rw-r--r--gr-filter/include/filter/single_pole_iir_filter_ff.h2
24 files changed, 24 insertions, 24 deletions
diff --git a/gr-filter/include/filter/adaptive_fir_ccc.h b/gr-filter/include/filter/adaptive_fir_ccc.h
index 616a52f735..261259957f 100644
--- a/gr-filter/include/filter/adaptive_fir_ccc.h
+++ b/gr-filter/include/filter/adaptive_fir_ccc.h
@@ -72,7 +72,7 @@ namespace gr {
* \param decimation (interger) decimation rate of the filter
* \param taps (complex) filter taps
*/
- static FILTER_API sptr make(const char *name, int decimation,
+ static sptr make(const char *name, int decimation,
const std::vector<gr_complex> &taps);
virtual void set_taps(const std::vector<gr_complex> &taps) = 0;
diff --git a/gr-filter/include/filter/adaptive_fir_ccf.h b/gr-filter/include/filter/adaptive_fir_ccf.h
index 0c19611d5e..0fd8d5746a 100644
--- a/gr-filter/include/filter/adaptive_fir_ccf.h
+++ b/gr-filter/include/filter/adaptive_fir_ccf.h
@@ -68,7 +68,7 @@ namespace gr {
* \param decimation (interger) decimation rate of the filter
* \param taps (real) filter taps
*/
- static FILTER_API sptr make(const char *name, int decimation,
+ static sptr make(const char *name, int decimation,
const std::vector<float> &taps);
virtual void set_taps(const std::vector<float> &taps) = 0;
diff --git a/gr-filter/include/filter/channel_model.h b/gr-filter/include/filter/channel_model.h
index 44d7f1a645..2e808de8e5 100644
--- a/gr-filter/include/filter/channel_model.h
+++ b/gr-filter/include/filter/channel_model.h
@@ -64,7 +64,7 @@ namespace gr {
* \param taps Taps of a FIR filter to emulate a multipath delay profile.
* \param noise_seed A random number generator seed for the noise source.
*/
- static FILTER_API sptr make(double noise_voltage=0.0,
+ static sptr make(double noise_voltage=0.0,
double frequency_offset=0.0,
double epsilon=1.0,
const std::vector<gr_complex> &taps=std::vector<gr_complex>(1,1),
diff --git a/gr-filter/include/filter/dc_blocker_cc.h b/gr-filter/include/filter/dc_blocker_cc.h
index b0a38ffcb3..df4c815d60 100644
--- a/gr-filter/include/filter/dc_blocker_cc.h
+++ b/gr-filter/include/filter/dc_blocker_cc.h
@@ -65,7 +65,7 @@ namespace gr {
* \param D (int) the length of the delay line
* \param long_form (bool) whether to use long (true, default) or short form
*/
- static FILTER_API sptr make(int D, bool long_form);
+ static sptr make(int D, bool long_form);
virtual int group_delay() = 0;
};
diff --git a/gr-filter/include/filter/dc_blocker_ff.h b/gr-filter/include/filter/dc_blocker_ff.h
index 18c7297680..6ab4d5a3de 100644
--- a/gr-filter/include/filter/dc_blocker_ff.h
+++ b/gr-filter/include/filter/dc_blocker_ff.h
@@ -65,7 +65,7 @@ namespace gr {
* \param D (int) the length of the delay line
* \param long_form (bool) whether to use long (true, default) or short form
*/
- static FILTER_API sptr make(int D, bool long_form=true);
+ static sptr make(int D, bool long_form=true);
virtual int group_delay() = 0;
};
diff --git a/gr-filter/include/filter/fft_filter_ccc.h b/gr-filter/include/filter/fft_filter_ccc.h
index c018629a94..acec932775 100644
--- a/gr-filter/include/filter/fft_filter_ccc.h
+++ b/gr-filter/include/filter/fft_filter_ccc.h
@@ -62,7 +62,7 @@ namespace gr {
* \param taps complex filter taps
* \param nthreads number of threads for the FFT to use
*/
- static FILTER_API sptr make(int decimation,
+ static sptr make(int decimation,
const std::vector<gr_complex> &taps,
int nthreads=1);
diff --git a/gr-filter/include/filter/fft_filter_fff.h b/gr-filter/include/filter/fft_filter_fff.h
index 78540666c8..d8140325f2 100644
--- a/gr-filter/include/filter/fft_filter_fff.h
+++ b/gr-filter/include/filter/fft_filter_fff.h
@@ -62,7 +62,7 @@ namespace gr {
* \param taps float filter taps
* \param nthreads number of threads for the FFT to use
*/
- static FILTER_API sptr make(int decimation,
+ static sptr make(int decimation,
const std::vector<float> &taps,
int nthreads=1);
diff --git a/gr-filter/include/filter/filter_delay_fc.h b/gr-filter/include/filter/filter_delay_fc.h
index 299a655193..8a84a6a0e5 100644
--- a/gr-filter/include/filter/filter_delay_fc.h
+++ b/gr-filter/include/filter/filter_delay_fc.h
@@ -56,7 +56,7 @@ namespace gr {
* taps needs to be calculated before initializing this block.
*
*/
- static FILTER_API sptr make(const std::vector<float> &taps);
+ static sptr make(const std::vector<float> &taps);
};
} /* namespace filter */
diff --git a/gr-filter/include/filter/fir_filter_XXX.h.t b/gr-filter/include/filter/fir_filter_XXX.h.t
index fc768bcad1..98e82f510d 100644
--- a/gr-filter/include/filter/fir_filter_XXX.h.t
+++ b/gr-filter/include/filter/fir_filter_XXX.h.t
@@ -69,7 +69,7 @@ namespace gr {
* \param decimation set the integer decimation rate
* \param taps a vector/list of taps of type @TAP_TYPE@
*/
- static FILTER_API sptr make(int decimation,
+ static sptr make(int decimation,
const std::vector<@TAP_TYPE@> &taps);
virtual void set_taps(const std::vector<@TAP_TYPE@> &taps) = 0;
diff --git a/gr-filter/include/filter/fractional_interpolator_cc.h b/gr-filter/include/filter/fractional_interpolator_cc.h
index 3f196c80f9..bb0e18932e 100644
--- a/gr-filter/include/filter/fractional_interpolator_cc.h
+++ b/gr-filter/include/filter/fractional_interpolator_cc.h
@@ -45,7 +45,7 @@ namespace gr {
* \param phase_shift The phase shift of the output signal to the input
* \param interp_ratio The interpolation ratio = input_rate / output_rate.
*/
- static FILTER_API sptr make(float phase_shift,
+ static sptr make(float phase_shift,
float interp_ratio);
virtual float mu() const = 0;
diff --git a/gr-filter/include/filter/fractional_interpolator_ff.h b/gr-filter/include/filter/fractional_interpolator_ff.h
index e05da847d2..fc43c34570 100644
--- a/gr-filter/include/filter/fractional_interpolator_ff.h
+++ b/gr-filter/include/filter/fractional_interpolator_ff.h
@@ -45,7 +45,7 @@ namespace gr {
* \param phase_shift The phase shift of the output signal to the input
* \param interp_ratio The interpolation ratio = input_rate / output_rate.
*/
- static FILTER_API sptr make(float phase_shift,
+ static sptr make(float phase_shift,
float interp_ratio);
virtual float mu() const = 0;
diff --git a/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t b/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t
index 8764c4f0d9..88e15f823d 100644
--- a/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t
+++ b/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t
@@ -72,7 +72,7 @@ namespace gr {
* \param center_freq Center frequency of signal to down convert from (Hz)
* \param sampling_freq Sampling rate of signal (in Hz)
*/
- static FILTER_API sptr make(int decimation,
+ static sptr make(int decimation,
const std::vector<@TAP_TYPE@> &taps,
double center_freq,
double sampling_freq);
diff --git a/gr-filter/include/filter/hilbert_fc.h b/gr-filter/include/filter/hilbert_fc.h
index d29f8a7269..de7cd82b69 100644
--- a/gr-filter/include/filter/hilbert_fc.h
+++ b/gr-filter/include/filter/hilbert_fc.h
@@ -44,7 +44,7 @@ namespace gr {
* imaginary output is hilbert filtered (90 degree phase shift)
* version of input.
*/
- static FILTER_API sptr make(unsigned int ntaps);
+ static sptr make(unsigned int ntaps);
};
} /* namespace filter */
diff --git a/gr-filter/include/filter/iir_filter_ffd.h b/gr-filter/include/filter/iir_filter_ffd.h
index c23286ddcc..04dd1e7767 100644
--- a/gr-filter/include/filter/iir_filter_ffd.h
+++ b/gr-filter/include/filter/iir_filter_ffd.h
@@ -69,7 +69,7 @@ namespace gr {
// gr::filter::iir_filter_ffd::sptr
typedef boost::shared_ptr<iir_filter_ffd> sptr;
- static FILTER_API sptr make(const std::vector<double> &fftaps,
+ static sptr make(const std::vector<double> &fftaps,
const std::vector<double> &fbtaps);
virtual void set_taps(const std::vector<double> &fftaps,
diff --git a/gr-filter/include/filter/interp_fir_filter_XXX.h.t b/gr-filter/include/filter/interp_fir_filter_XXX.h.t
index eaf2152000..b66c9f6439 100644
--- a/gr-filter/include/filter/interp_fir_filter_XXX.h.t
+++ b/gr-filter/include/filter/interp_fir_filter_XXX.h.t
@@ -68,7 +68,7 @@ namespace gr {
* \param interpolation set the integer interpolation rate
* \param taps a vector/list of taps of type @TAP_TYPE@
*/
- static FILTER_API sptr make(unsigned interpolation,
+ static sptr make(unsigned interpolation,
const std::vector<@TAP_TYPE@> &taps);
virtual void set_taps(const std::vector<@TAP_TYPE@> &taps) = 0;
diff --git a/gr-filter/include/filter/pfb_arb_resampler_ccf.h b/gr-filter/include/filter/pfb_arb_resampler_ccf.h
index 397ac25ea5..a154e055a0 100644
--- a/gr-filter/include/filter/pfb_arb_resampler_ccf.h
+++ b/gr-filter/include/filter/pfb_arb_resampler_ccf.h
@@ -110,7 +110,7 @@ namespace gr {
* related to quantization noise introduced during the resampling.
* Defaults to 32 filters.
*/
- static FILTER_API sptr make(float rate,
+ static sptr make(float rate,
const std::vector<float> &taps,
unsigned int filter_size=32);
/*!
diff --git a/gr-filter/include/filter/pfb_arb_resampler_fff.h b/gr-filter/include/filter/pfb_arb_resampler_fff.h
index b6623b028e..38dcc7132b 100644
--- a/gr-filter/include/filter/pfb_arb_resampler_fff.h
+++ b/gr-filter/include/filter/pfb_arb_resampler_fff.h
@@ -110,7 +110,7 @@ namespace gr {
* related to quantization noise introduced during the resampling.
* Defaults to 32 filters.
*/
- static FILTER_API sptr make(float rate,
+ static sptr make(float rate,
const std::vector<float> &taps,
unsigned int filter_size=32);
diff --git a/gr-filter/include/filter/pfb_channelizer_ccf.h b/gr-filter/include/filter/pfb_channelizer_ccf.h
index 7726809f22..2ff83b5e7e 100644
--- a/gr-filter/include/filter/pfb_channelizer_ccf.h
+++ b/gr-filter/include/filter/pfb_channelizer_ccf.h
@@ -139,7 +139,7 @@ namespace gr {
* oversample ratio is 6000 Hz,
* or 6 times the normal 1000 Hz.
*/
- static FILTER_API sptr make(unsigned int numchans,
+ static sptr make(unsigned int numchans,
const std::vector<float> &taps,
float oversample_rate);
diff --git a/gr-filter/include/filter/pfb_decimator_ccf.h b/gr-filter/include/filter/pfb_decimator_ccf.h
index 9db11b88da..bf9d0d9508 100644
--- a/gr-filter/include/filter/pfb_decimator_ccf.h
+++ b/gr-filter/include/filter/pfb_decimator_ccf.h
@@ -102,7 +102,7 @@ namespace gr {
* \param taps (vector/list of floats) The prototype filter to populate the filterbank.
* \param channel (unsigned integer) Selects the channel to return [default=0].
*/
- static FILTER_API sptr make(unsigned int decim,
+ static sptr make(unsigned int decim,
const std::vector<float> &taps,
unsigned int channel);
diff --git a/gr-filter/include/filter/pfb_interpolator_ccf.h b/gr-filter/include/filter/pfb_interpolator_ccf.h
index a31ca7129b..df28ab64d6 100644
--- a/gr-filter/include/filter/pfb_interpolator_ccf.h
+++ b/gr-filter/include/filter/pfb_interpolator_ccf.h
@@ -91,7 +91,7 @@ namespace gr {
* \param taps (vector/list of floats) The prototype filter to populate the filterbank. The taps
* should be generated at the interpolated sampling rate.
*/
- static FILTER_API sptr make(unsigned int interp,
+ static sptr make(unsigned int interp,
const std::vector<float> &taps);
/*!
diff --git a/gr-filter/include/filter/pfb_synthesizer_ccf.h b/gr-filter/include/filter/pfb_synthesizer_ccf.h
index ec6fb49c2e..faa16990cc 100644
--- a/gr-filter/include/filter/pfb_synthesizer_ccf.h
+++ b/gr-filter/include/filter/pfb_synthesizer_ccf.h
@@ -54,7 +54,7 @@ namespace gr {
* populate the filterbank.
* \param twox (bool) use 2x oversampling or not (default is no)
*/
- static FILTER_API sptr make(unsigned int numchans,
+ static sptr make(unsigned int numchans,
const std::vector<float> &taps,
bool twox=false);
diff --git a/gr-filter/include/filter/rational_resampler_base_XXX.h.t b/gr-filter/include/filter/rational_resampler_base_XXX.h.t
index c37eb30a76..e47a16ec6d 100644
--- a/gr-filter/include/filter/rational_resampler_base_XXX.h.t
+++ b/gr-filter/include/filter/rational_resampler_base_XXX.h.t
@@ -44,7 +44,7 @@ namespace gr {
// gr::filter::@BASE_NAME@::sptr
typedef boost::shared_ptr<@BASE_NAME@> sptr;
- static FILTER_API sptr make(unsigned interpolation,
+ static sptr make(unsigned interpolation,
unsigned decimation,
const std::vector<@TAP_TYPE@> &taps);
diff --git a/gr-filter/include/filter/single_pole_iir_filter_cc.h b/gr-filter/include/filter/single_pole_iir_filter_cc.h
index 37db7c65fb..82febe8ec4 100644
--- a/gr-filter/include/filter/single_pole_iir_filter_cc.h
+++ b/gr-filter/include/filter/single_pole_iir_filter_cc.h
@@ -67,7 +67,7 @@ namespace gr {
// gr::filter::single_pole_iir_filter_cc::sptr
typedef boost::shared_ptr<single_pole_iir_filter_cc> sptr;
- static FILTER_API sptr make(double alpha, unsigned int vlen=1);
+ static sptr make(double alpha, unsigned int vlen=1);
virtual void set_taps(double alpha) = 0;
};
diff --git a/gr-filter/include/filter/single_pole_iir_filter_ff.h b/gr-filter/include/filter/single_pole_iir_filter_ff.h
index 8abce94c90..d85688db84 100644
--- a/gr-filter/include/filter/single_pole_iir_filter_ff.h
+++ b/gr-filter/include/filter/single_pole_iir_filter_ff.h
@@ -67,7 +67,7 @@ namespace gr {
// gr::filter::single_pole_iir_filter_ff::sptr
typedef boost::shared_ptr<single_pole_iir_filter_ff> sptr;
- static FILTER_API sptr make(double alpha, unsigned int vlen=1);
+ static sptr make(double alpha, unsigned int vlen=1);
virtual void set_taps (double alpha) = 0;
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 14:02:08 +0000