diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-04 21:13:27 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-04 21:13:27 +0000 |
| commit | 685cf432a373ee7556db507f7958f51e6ccf581a (patch) | |
| tree | 56524f4d40152aa419832ddd7d8a05ac9045766e /host/lib/usrp/usrp_e/clock_ctrl.cpp | |
| parent | fcdbea4f089db2405820ad598979e639cf131ff5 (diff) | |
| download | uhd-685cf432a373ee7556db507f7958f51e6ccf581a.tar.gz uhd-685cf432a373ee7556db507f7958f51e6ccf581a.tar.bz2 uhd-685cf432a373ee7556db507f7958f51e6ccf581a.zip | |
prefixed helper classes with usrp_e to avoid collision
Diffstat (limited to 'host/lib/usrp/usrp_e/clock_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp_e/clock_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp_e/clock_ctrl.cpp b/host/lib/usrp/usrp_e/clock_ctrl.cpp index 7947930a0..e37b17a54 100644 --- a/host/lib/usrp/usrp_e/clock_ctrl.cpp +++ b/host/lib/usrp/usrp_e/clock_ctrl.cpp @@ -29,7 +29,7 @@ using namespace uhd; /*********************************************************************** * Clock Control Implementation **********************************************************************/ -class usrp_e_clock_ctrl_impl : public clock_ctrl{ +class usrp_e_clock_ctrl_impl : public usrp_e_clock_ctrl{ public: //structors usrp_e_clock_ctrl_impl(usrp_e_iface::sptr iface); @@ -170,6 +170,6 @@ void usrp_e_clock_ctrl_impl::send_reg(boost::uint16_t addr){ /*********************************************************************** * Clock Control Make **********************************************************************/ -clock_ctrl::sptr clock_ctrl::make(usrp_e_iface::sptr iface){ +usrp_e_clock_ctrl::sptr usrp_e_clock_ctrl::make(usrp_e_iface::sptr iface){ return sptr(new usrp_e_clock_ctrl_impl(iface)); } |