diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-08 13:43:32 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-08 13:43:32 -0700 |
| commit | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (patch) | |
| tree | 9ee830618e5d8253af8e8cec72dcec8925092dda /gr-digital | |
| parent | 369834c83e26ac090dbac48c8c8e885ba210665a (diff) | |
gr: minor tweaks for MSVC compatibility
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/include/digital_constellation.h | 2 | ||||
| -rw-r--r-- | gr-digital/include/digital_constellation_receiver_cb.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gr-digital/include/digital_constellation.h b/gr-digital/include/digital_constellation.h index 9b2a585883..3de3505320 100644 --- a/gr-digital/include/digital_constellation.h +++ b/gr-digital/include/digital_constellation.h @@ -86,7 +86,7 @@ public: unsigned int dimensionality() {return d_dimensionality;} unsigned int bits_per_symbol () { - return floor(log(d_constellation.size())/d_dimensionality/log(2)); + return floor(log(1.0*d_constellation.size())/d_dimensionality/log(2.0)); } unsigned int arity () { diff --git a/gr-digital/include/digital_constellation_receiver_cb.h b/gr-digital/include/digital_constellation_receiver_cb.h index d33be89585..59b2d27854 100644 --- a/gr-digital/include/digital_constellation_receiver_cb.h +++ b/gr-digital/include/digital_constellation_receiver_cb.h @@ -26,6 +26,7 @@ #include <digital_api.h> #include <gr_block.h> #include <digital_constellation.h> +#include <gruel/attributes.h> #include <gri_control_loop.h> #include <gr_complex.h> #include <math.h> @@ -102,7 +103,7 @@ private: static const unsigned int DLLEN = 8; //! delay line plus some length for overflow protection - gr_complex d_dl[2*DLLEN] __attribute__ ((aligned(8))); + __GR_ATTR_ALIGNED(8) gr_complex d_dl[2*DLLEN]; //! index to delay line unsigned int d_dl_idx; |