diff options
| author | Tom Rondeau | 2011-01-22 15:15:51 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-22 15:15:51 -0500 |
| commit | 85759ff0f893b9377b156609d68c6453feb304c9 (patch) | |
| tree | 4e98c50ac421da05a27d3bbbd4dd45ba43e6eab6 /gnuradio-core/src | |
| parent | bd8dd840173e38041b221758ca1baeb4b4584944 (diff) | |
| parent | 089fe0e8b2cd02e90fc4c095297128c771fa43fa (diff) | |
| download | gnuradio-85759ff0f893b9377b156609d68c6453feb304c9.tar.gz gnuradio-85759ff0f893b9377b156609d68c6453feb304c9.tar.bz2 gnuradio-85759ff0f893b9377b156609d68c6453feb304c9.zip | |
Merge branch 'mergeme/misc/gr_fxpt_static_const_fix' into next
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fxpt.cc | 5 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fxpt.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/general/gr_fxpt.cc b/gnuradio-core/src/lib/general/gr_fxpt.cc index e752364a5..fae02c71e 100644 --- a/gnuradio-core/src/lib/general/gr_fxpt.cc +++ b/gnuradio-core/src/lib/general/gr_fxpt.cc @@ -30,9 +30,8 @@ const float gr_fxpt::s_sine_table[1 << NBITS][2] = { #include "sine_table.h" }; -// gcc 4.x fix -const float gr_fxpt::TWO_TO_THE_31; -const float gr_fxpt::PI; +const float gr_fxpt::PI = 3.14159265358979323846; +const float gr_fxpt::TWO_TO_THE_31 = 2147483648.0; #if 0 /* diff --git a/gnuradio-core/src/lib/general/gr_fxpt.h b/gnuradio-core/src/lib/general/gr_fxpt.h index 520729f8d..c98d31b27 100644 --- a/gnuradio-core/src/lib/general/gr_fxpt.h +++ b/gnuradio-core/src/lib/general/gr_fxpt.h @@ -40,8 +40,8 @@ class gr_fxpt static const int WORDBITS = 32; static const int NBITS = 10; static const float s_sine_table[1 << NBITS][2]; - static const float PI = 3.14159265358979323846; - static const float TWO_TO_THE_31 = 2147483648.0; + static const float PI; + static const float TWO_TO_THE_31; public: static gr_int32 |