diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-04 12:16:09 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-04 12:16:09 -0700 |
| commit | f2b560d5f8d19bf6bbd86802e03f061ecede78ec (patch) | |
| tree | 4e0d99411b2b1ebee38ef7bbe2fb26be87b39e05 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | dbc65d928362b983d8f6113319db87841a5b159d (diff) | |
| download | uhd-f2b560d5f8d19bf6bbd86802e03f061ecede78ec.tar.gz uhd-f2b560d5f8d19bf6bbd86802e03f061ecede78ec.tar.bz2 uhd-f2b560d5f8d19bf6bbd86802e03f061ecede78ec.zip | |
Prepend usrp2 onto the helper classes in usrp2 impl to avoid symbol conflicts.
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 40c193866..90306a85f 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -43,7 +43,7 @@ */ uhd::usrp::dboard_iface::sptr make_usrp2_dboard_iface( usrp2_iface::sptr iface, - clock_ctrl::sptr clk_ctrl + usrp2_clock_ctrl::sptr clk_ctrl ); /*! @@ -134,9 +134,9 @@ private: //interfaces usrp2_iface::sptr _iface; - clock_ctrl::sptr _clock_ctrl; - codec_ctrl::sptr _codec_ctrl; - serdes_ctrl::sptr _serdes_ctrl; + usrp2_clock_ctrl::sptr _clock_ctrl; + usrp2_codec_ctrl::sptr _codec_ctrl; + usrp2_serdes_ctrl::sptr _serdes_ctrl; /******************************************************************* * Deal with the rx and tx packet sizes |