diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-04 21:13:53 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-04 21:13:53 +0000 |
| commit | 9fa97e153d01985bc7bdf9db8a97d79a328a3e61 (patch) | |
| tree | 68606b25eff9d2d88878bbd89c794fc86ac18fb5 /host/lib/usrp/usrp2/codec_ctrl.hpp | |
| parent | 685cf432a373ee7556db507f7958f51e6ccf581a (diff) | |
| parent | 4f0736ef7ce93d58f0768d99257b2624d5711490 (diff) | |
| download | uhd-9fa97e153d01985bc7bdf9db8a97d79a328a3e61.tar.gz uhd-9fa97e153d01985bc7bdf9db8a97d79a328a3e61.tar.bz2 uhd-9fa97e153d01985bc7bdf9db8a97d79a328a3e61.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/usrp/usrp2/codec_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp index 0ee52f476..ad014e0e1 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.hpp +++ b/host/lib/usrp/usrp2/codec_ctrl.hpp @@ -22,9 +22,9 @@ #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> -class codec_ctrl : boost::noncopyable{ +class usrp2_codec_ctrl : boost::noncopyable{ public: - typedef boost::shared_ptr<codec_ctrl> sptr; + typedef boost::shared_ptr<usrp2_codec_ctrl> sptr; /*! * Make a codec control for the DAC and ADC. |