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_uart.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_uart.hpp')
| -rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_uart.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_uart.hpp b/host/lib/usrp_clock/octoclock/octoclock_uart.hpp index d3a9738c4..390c202fe 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_uart.hpp +++ b/host/lib/usrp_clock/octoclock/octoclock_uart.hpp @@ -40,13 +40,13 @@ public: private: uhd::transport::udp_simple::sptr _udp; - boost::uint16_t _poolsize; + uint16_t _poolsize; gpsdo_cache_state_t _state; gpsdo_cache_state_t _device_state; - std::vector<boost::uint8_t> _cache; + std::vector<uint8_t> _cache; std::string _rxbuff; - boost::uint32_t _sequence; - boost::uint32_t _proto_ver; + uint32_t _sequence; + uint32_t _proto_ver; boost::system_time _last_cache_update; void _update_cache(); |