diff options
Diffstat (limited to 'gr-digital/lib/digital_constellation.h')
| -rw-r--r-- | gr-digital/lib/digital_constellation.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h index 8cf4087ca..df00f3898 100644 --- a/gr-digital/lib/digital_constellation.h +++ b/gr-digital/lib/digital_constellation.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_DIGITAL_CONSTELLATION_H #define INCLUDED_DIGITAL_CONSTELLATION_H -#include <gr_digital_api.h> +#include <digital_api.h> #include <vector> #include <math.h> #include <gr_complex.h> @@ -39,7 +39,7 @@ class digital_constellation; typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr; -class GR_DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation> +class DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation> { public: digital_constellation (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code, @@ -119,12 +119,12 @@ class digital_constellation_calcdist; typedef boost::shared_ptr<digital_constellation_calcdist> digital_constellation_calcdist_sptr; // public constructor -GR_DIGITAL_API digital_constellation_calcdist_sptr +DIGITAL_API digital_constellation_calcdist_sptr digital_make_constellation_calcdist (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code, unsigned int rotational_symmetry, unsigned int dimensionality); -class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellation +class DIGITAL_API digital_constellation_calcdist : public digital_constellation { public: digital_constellation_calcdist (std::vector<gr_complex> constellation, @@ -137,7 +137,7 @@ class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellati // void calc_hard_symbol_metric(gr_complex *sample, float *metric); private: - friend GR_DIGITAL_API digital_constellation_calcdist_sptr + friend DIGITAL_API digital_constellation_calcdist_sptr digital_make_constellation_calcdist (std::vector<gr_complex> constellation); }; @@ -150,7 +150,7 @@ class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellati /* point. */ /************************************************************/ -class GR_DIGITAL_API digital_constellation_sector : public digital_constellation +class DIGITAL_API digital_constellation_sector : public digital_constellation { public: @@ -193,13 +193,13 @@ class digital_constellation_rect; typedef boost::shared_ptr<digital_constellation_rect> digital_constellation_rect_sptr; // public constructor -GR_DIGITAL_API digital_constellation_rect_sptr +DIGITAL_API digital_constellation_rect_sptr digital_make_constellation_rect (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code, unsigned int rotational_symmetry, unsigned int real_sectors, unsigned int imag_sectors, float width_real_sectors, float width_imag_sectors); -class GR_DIGITAL_API digital_constellation_rect : public digital_constellation_sector +class DIGITAL_API digital_constellation_rect : public digital_constellation_sector { public: @@ -221,7 +221,7 @@ class GR_DIGITAL_API digital_constellation_rect : public digital_constellation_s float d_width_real_sectors; float d_width_imag_sectors; - friend GR_DIGITAL_API digital_constellation_rect_sptr + friend DIGITAL_API digital_constellation_rect_sptr digital_make_constellation_rect (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code, unsigned int rotational_symmetry, unsigned int real_sectors, unsigned int imag_sectors, @@ -243,12 +243,12 @@ class digital_constellation_psk; typedef boost::shared_ptr<digital_constellation_psk> digital_constellation_psk_sptr; // public constructor -GR_DIGITAL_API digital_constellation_psk_sptr +DIGITAL_API digital_constellation_psk_sptr digital_make_constellation_psk (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code, unsigned int n_sectors); -class GR_DIGITAL_API digital_constellation_psk : public digital_constellation_sector +class DIGITAL_API digital_constellation_psk : public digital_constellation_sector { public: @@ -264,7 +264,7 @@ class GR_DIGITAL_API digital_constellation_psk : public digital_constellation_se private: - friend GR_DIGITAL_API digital_constellation_psk_sptr + friend DIGITAL_API digital_constellation_psk_sptr digital_make_constellation_psk (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code, unsigned int n_sectors); @@ -282,17 +282,17 @@ class digital_constellation_bpsk; typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr; // public constructor -GR_DIGITAL_API digital_constellation_bpsk_sptr +DIGITAL_API digital_constellation_bpsk_sptr digital_make_constellation_bpsk (); -class GR_DIGITAL_API digital_constellation_bpsk : public digital_constellation +class DIGITAL_API digital_constellation_bpsk : public digital_constellation { public: digital_constellation_bpsk (); unsigned int decision_maker (const gr_complex *sample); - friend GR_DIGITAL_API digital_constellation_bpsk_sptr + friend DIGITAL_API digital_constellation_bpsk_sptr digital_make_constellation_bpsk (); }; @@ -308,17 +308,17 @@ class digital_constellation_qpsk; typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr; // public constructor -GR_DIGITAL_API digital_constellation_qpsk_sptr +DIGITAL_API digital_constellation_qpsk_sptr digital_make_constellation_qpsk (); -class GR_DIGITAL_API digital_constellation_qpsk : public digital_constellation +class DIGITAL_API digital_constellation_qpsk : public digital_constellation { public: digital_constellation_qpsk (); unsigned int decision_maker (const gr_complex *sample); - friend GR_DIGITAL_API digital_constellation_qpsk_sptr + friend DIGITAL_API digital_constellation_qpsk_sptr digital_make_constellation_qpsk (); }; @@ -335,17 +335,17 @@ class digital_constellation_8psk; typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr; // public constructor -GR_DIGITAL_API digital_constellation_8psk_sptr +DIGITAL_API digital_constellation_8psk_sptr digital_make_constellation_8psk (); -class GR_DIGITAL_API digital_constellation_8psk : public digital_constellation +class DIGITAL_API digital_constellation_8psk : public digital_constellation { public: digital_constellation_8psk (); unsigned int decision_maker (const gr_complex *sample); - friend GR_DIGITAL_API digital_constellation_8psk_sptr + friend DIGITAL_API digital_constellation_8psk_sptr digital_make_constellation_8psk (); }; |