Merge branch '8psk' of github.com:trondeau/gnuradio into 8psk

Conflicts:
	gr-digital/lib/digital_costas_loop_cc.cc
	gr-digital/python/qa_costas_loop_cc.py

3 files changed, 11 insertions, 23 deletions

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index d93b243e2..c27682f7f 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -37,6 +37,6 @@ libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
 	$(UHD_LIBS)
 
-libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS)
+libgnuradio_uhd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 noinst_HEADERS =
diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc
index b8b99a41a..d44af25ab 100644
--- a/gr-uhd/lib/gr_uhd_usrp_sink.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc
@@ -24,14 +24,6 @@
 #include <stdexcept>
 
 /***********************************************************************
- * UHD Multi USRP Sink
- **********************************************************************/
-uhd_usrp_sink::uhd_usrp_sink(gr_io_signature_sptr sig)
-:gr_sync_block("gr uhd usrp sink", sig, gr_make_io_signature(0, 0, 0)){
-    /* NOP */
-}
-
-/***********************************************************************
  * UHD Multi USRP Sink Impl
  **********************************************************************/
 class uhd_usrp_sink_impl : public uhd_usrp_sink{
@@ -41,9 +33,11 @@ public:
         const uhd::io_type_t &io_type,
         size_t num_channels
     ):
-        uhd_usrp_sink(gr_make_io_signature(
-            num_channels, num_channels, io_type.size
-        )),
+        gr_sync_block(
+            "gr uhd usrp sink",
+            gr_make_io_signature(num_channels, num_channels, io_type.size),
+            gr_make_io_signature(0, 0, 0)
+        ),
         _type(io_type),
         _nchan(num_channels),
         _has_time_spec(_nchan > 1)
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 1234ed7fe..fed8e6624 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -26,14 +26,6 @@
 #include <boost/format.hpp>
 
 /***********************************************************************
- * UHD Multi USRP Source
- **********************************************************************/
-uhd_usrp_source::uhd_usrp_source(gr_io_signature_sptr sig)
-:gr_sync_block("gr uhd usrp source", gr_make_io_signature(0, 0, 0), sig){
-    /* NOP */
-}
-
-/***********************************************************************
  * UHD Multi USRP Source Impl
  **********************************************************************/
 class uhd_usrp_source_impl : public uhd_usrp_source{
@@ -43,9 +35,11 @@ public:
         const uhd::io_type_t &io_type,
         size_t num_channels
     ):
-        uhd_usrp_source(gr_make_io_signature(
-            num_channels, num_channels, io_type.size
-        )),
+        gr_sync_block(
+            "gr uhd usrp source",
+            gr_make_io_signature(0, 0, 0),
+            gr_make_io_signature(num_channels, num_channels, io_type.size)
+        ),
         _type(io_type),
         _nchan(num_channels),
         _stream_now(_nchan == 1),