[Commit-gnuradio] [gnuradio] 39/43: dtv: move "static const" variables from header / class into the main code. The original code is not necessary to have in the class, and causes issues when compiling using c++11 compliance.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 225c6b33730b8812ba82cbc93884aef7edcaad1c
Author: Michael Dickens <address@hidden>
Date:   Thu Apr 2 15:00:09 2015 -0400

    dtv: move "static const" variables from header / class into the main code. 
The original code is not necessary to have in the class, and causes issues when 
compiling using c++11 compliance.
---
 gr-dtv/lib/atsc/atsc_sync_impl.cc | 7 +++++++
 gr-dtv/lib/atsc/atsc_sync_impl.h  | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.cc 
b/gr-dtv/lib/atsc/atsc_sync_impl.cc
index ec46d6b..d83bccc 100644
--- a/gr-dtv/lib/atsc/atsc_sync_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.cc
@@ -31,6 +31,13 @@
 namespace gr {
   namespace dtv {
 
+    static const double LOOP_FILTER_TAP = 0.0005;      // 0.0005 works
+    static const double ADJUSTMENT_GAIN = 1.0e-5 / (10 * 
ATSC_DATA_SEGMENT_LENGTH);
+    static const int   SYMBOL_INDEX_OFFSET = 3;
+    static const int   MIN_SEG_LOCK_CORRELATION_VALUE = 5;
+    static const int   SSI_MIN = -16;
+    static const int   SSI_MAX =  15;
+
     atsc_sync::sptr
     atsc_sync::make(float rate)
     {
diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.h b/gr-dtv/lib/atsc/atsc_sync_impl.h
index eb0ad17..f5e6450 100644
--- a/gr-dtv/lib/atsc/atsc_sync_impl.h
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.h
@@ -34,13 +34,6 @@ namespace gr {
     class atsc_sync_impl : public atsc_sync
     {
     private:
-      static const double LOOP_FILTER_TAP = 0.0005;    // 0.0005 works
-      static const double ADJUSTMENT_GAIN = 1.0e-5 / (10 * 
ATSC_DATA_SEGMENT_LENGTH);
-      static const int   SYMBOL_INDEX_OFFSET = 3;
-      static const int   MIN_SEG_LOCK_CORRELATION_VALUE = 5;
-      static const int   SSI_MIN = -16;
-      static const int   SSI_MAX =  15;
-
       gr::filter::single_pole_iir<float,float,float> d_loop; // ``VCO'' loop 
filter
       gr::filter::mmse_fir_interpolator_ff d_interp;