diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-27 07:25:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-27 07:25:30 -0700 |
| commit | d241c13acb5d53f60e4f39b2b99aae83a53afaab (patch) | |
| tree | 30ab73ae70bf65e5a696881a5b2c7be8b5ecbb87 /gr-uhd/lib/usrp_block_impl.h | |
| parent | efbb415e5abeefe0cedf36f44e13362514fd4521 (diff) | |
| parent | 26de50e62da7116754c0175c32c4179de2d13672 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib/usrp_block_impl.h')
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h index 37c1de1e56..cb07fb356d 100644 --- a/gr-uhd/lib/usrp_block_impl.h +++ b/gr-uhd/lib/usrp_block_impl.h @@ -40,11 +40,6 @@ namespace gr { namespace uhd { - static const size_t ALL_MBOARDS = ::uhd::usrp::multi_usrp::ALL_MBOARDS; - static const size_t ALL_CHANS = ::uhd::usrp::multi_usrp::ALL_CHANS; - static const std::string ALL_GAINS = ::uhd::usrp::multi_usrp::ALL_GAINS; - static const std::string ALL_LOS = ::uhd::usrp::multi_usrp::ALL_LOS; - class usrp_block_impl : virtual public usrp_block { public: |