[Commit-gnuradio] [gnuradio] 13/15: digital: fix for issue #664.

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit ba7e4e940f156c24085fe3885e42ac8f035915fa
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 10 15:18:30 2014 -0400

    digital: fix for issue #664.
    
    The mpsk_receiver_cc block needed to publicly inherit from control_loop.
---
 gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h | 5 ++++-
 gr-digital/lib/mpsk_receiver_cc_impl.h                 | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h 
b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
index 8bc2bce..618d192 100644
--- a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
+++ b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
@@ -25,6 +25,7 @@
 
 #include <gnuradio/digital/api.h>
 #include <gnuradio/block.h>
+#include <gnuradio/blocks/control_loop.h>
 
 namespace gr {
   namespace digital {
@@ -65,7 +66,9 @@ namespace gr {
      * self-noise.
      *
      */
-    class DIGITAL_API mpsk_receiver_cc : virtual public block
+    class DIGITAL_API mpsk_receiver_cc
+      : virtual public block,
+        virtual public blocks::control_loop
     {
     public:
       // gr::digital::mpsk_receiver_cc::sptr
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h 
b/gr-digital/lib/mpsk_receiver_cc_impl.h
index fc5cc77..48a9e43 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.h
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.h
@@ -25,7 +25,6 @@
 
 #include <gnuradio/digital/mpsk_receiver_cc.h>
 #include <gnuradio/attributes.h>
-#include <gnuradio/blocks/control_loop.h>
 #include <gnuradio/gr_complex.h>
 #include <fstream>
 #include <gnuradio/filter/mmse_fir_interpolator_cc.h>
@@ -33,8 +32,7 @@
 namespace gr {
   namespace digital {
 
-    class mpsk_receiver_cc_impl
-      : public mpsk_receiver_cc, public blocks::control_loop
+    class mpsk_receiver_cc_impl : public mpsk_receiver_cc
     {
     public:
       mpsk_receiver_cc_impl(unsigned int M, float theta,