diff options
| author | Josh Blum | 2011-07-23 11:54:16 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-23 11:54:16 -0700 |
| commit | c6c773757ef16aa8edac173a5b9bca270a658b9f (patch) | |
| tree | 7e3410eb08a81f2b4eec05ec42c359ad24c8d553 /gr-digital/lib | |
| parent | dcee8e7416b849234bc09e1ae8a2acb1d3d21e3a (diff) | |
| download | gnuradio-c6c773757ef16aa8edac173a5b9bca270a658b9f.tar.gz gnuradio-c6c773757ef16aa8edac173a5b9bca270a658b9f.tar.bz2 gnuradio-c6c773757ef16aa8edac173a5b9bca270a658b9f.zip | |
misc_next_branch_tweaks_to_build_on_osx_and_windows
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/digital_constellation.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc index 2263bba0b..d1f218439 100644 --- a/gr-digital/lib/digital_constellation.cc +++ b/gr-digital/lib/digital_constellation.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gr_io_signature.h> #include <digital_constellation.h> #include <digital_metric_type.h> diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h index 4119b5803..d345ebc10 100644 --- a/gr-digital/lib/digital_constellation.h +++ b/gr-digital/lib/digital_constellation.h @@ -81,7 +81,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(double(d_constellation.size()))/d_dimensionality/log(2.0)); } unsigned int arity () { |