From 089fe0e8b2cd02e90fc4c095297128c771fa43fa Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 17:26:09 -0800
Subject: gr fxpt static const fix:

Initialize PI and TWO_TO_THE_31 the standard portable c++ way.
No need for "gcc 4.x fix".
See http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.12
---
 gnuradio-core/src/lib/general/gr_fxpt.cc | 5 ++---
 gnuradio-core/src/lib/general/gr_fxpt.h  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'gnuradio-core/src')

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
-- 
cgit