summaryrefslogtreecommitdiff
path: root/gr-uhd
diff options
context:
space:
mode:
authorRob Savoye2010-11-21 21:49:17 -0700
committerRob Savoye2010-11-21 21:49:17 -0700
commit534d95dcadcd4351337ba3fd97a2c94405bc6124 (patch)
tree5384896921f7050ed4004f6543e55f617fad6ee0 /gr-uhd
parent9cf988ad17529416f841870b01d0f548e1a0b9a0 (diff)
parente4eb47f0dd55485693e70ec2f45f79912fa899c4 (diff)
downloadgnuradio-534d95dcadcd4351337ba3fd97a2c94405bc6124.tar.gz
gnuradio-534d95dcadcd4351337ba3fd97a2c94405bc6124.tar.bz2
gnuradio-534d95dcadcd4351337ba3fd97a2c94405bc6124.zip
merge from upstream
Diffstat (limited to 'gr-uhd')
-rw-r--r--gr-uhd/lib/uhd_mimo_sink.h2
-rw-r--r--gr-uhd/lib/uhd_mimo_source.h2
-rw-r--r--gr-uhd/lib/uhd_simple_sink.h2
-rw-r--r--gr-uhd/lib/uhd_simple_source.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/gr-uhd/lib/uhd_mimo_sink.h b/gr-uhd/lib/uhd_mimo_sink.h
index 28a530b60..29e9298a9 100644
--- a/gr-uhd/lib/uhd_mimo_sink.h
+++ b/gr-uhd/lib/uhd_mimo_sink.h
@@ -37,7 +37,7 @@ boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink(
/***********************************************************************
* DEPRECATED
**********************************************************************/
-class UHD_DEPRECATED uhd_mimo_sink : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_mimo_sink : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h
index dc2927598..36735ae7e 100644
--- a/gr-uhd/lib/uhd_mimo_source.h
+++ b/gr-uhd/lib/uhd_mimo_source.h
@@ -37,7 +37,7 @@ boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source(
/***********************************************************************
* DEPRECATED
**********************************************************************/
-class UHD_DEPRECATED uhd_mimo_source : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_mimo_source : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h
index b239e3f21..930487049 100644
--- a/gr-uhd/lib/uhd_simple_sink.h
+++ b/gr-uhd/lib/uhd_simple_sink.h
@@ -36,7 +36,7 @@ boost::shared_ptr<uhd_simple_sink> uhd_make_simple_sink(
/***********************************************************************
* DEPRECATED
**********************************************************************/
-class UHD_DEPRECATED uhd_simple_sink : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_simple_sink : public gr_sync_block{
public:
/*!
diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h
index c524a024a..d9f8d252a 100644
--- a/gr-uhd/lib/uhd_simple_source.h
+++ b/gr-uhd/lib/uhd_simple_source.h
@@ -36,7 +36,7 @@ boost::shared_ptr<uhd_simple_source> uhd_make_simple_source(
/***********************************************************************
* DEPRECATED
**********************************************************************/
-class UHD_DEPRECATED uhd_simple_source : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_simple_source : public gr_sync_block{
public:
/*!