diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp_clock/octoclock/octoclock_impl.hpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp_clock/octoclock/octoclock_impl.hpp')
| -rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_impl.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.hpp b/host/lib/usrp_clock/octoclock/octoclock_impl.hpp index 2c74b9b03..1cb3b60e1 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_impl.hpp +++ b/host/lib/usrp_clock/octoclock/octoclock_impl.hpp @@ -56,12 +56,12 @@ private: uhd::gps_ctrl::sptr gps; }; uhd::dict<std::string, oc_container_type> _oc_dict; - boost::uint32_t _sequence; - boost::uint32_t _proto_ver; + uint32_t _sequence; + uint32_t _proto_ver; void _set_eeprom(const std::string &oc, const uhd::usrp_clock::octoclock_eeprom_t &oc_eeprom); - boost::uint32_t _get_fw_version(const std::string &oc); + uint32_t _get_fw_version(const std::string &oc); void _get_state(const std::string &oc); @@ -73,7 +73,7 @@ private: uhd::sensor_value_t _switch_pos(const std::string &oc); - boost::uint32_t _get_time(const std::string &oc); + uint32_t _get_time(const std::string &oc); std::string _get_images_help_message(const std::string &addr); |