diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2016-06-21 09:10:06 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2016-06-21 09:10:06 -0700 |
| commit | f28a52b652d4234aa88db7c2df80f8b4a6ce6535 (patch) | |
| tree | 3cc473fd4d981bd35f2326cfd5eb95a4dfc41dc7 /host/lib/usrp/gpsd_iface.cpp | |
| parent | 9cc4e16b77d074c8d416725ead1afb8898007eb3 (diff) | |
| download | uhd-f28a52b652d4234aa88db7c2df80f8b4a6ce6535.tar.gz uhd-f28a52b652d4234aa88db7c2df80f8b4a6ce6535.tar.bz2 uhd-f28a52b652d4234aa88db7c2df80f8b4a6ce6535.zip | |
lib: fixed GCC 6 warnings/errors
* gpsd_iface: fixed ambiguity in boost::assign::list_of usage
* b100/clock_ctrl: fixed "misleading indentation" warning
Diffstat (limited to 'host/lib/usrp/gpsd_iface.cpp')
| -rw-r--r-- | host/lib/usrp/gpsd_iface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp index e0a1dea05..cd7e5601a 100644 --- a/host/lib/usrp/gpsd_iface.cpp +++ b/host/lib/usrp/gpsd_iface.cpp @@ -1,5 +1,5 @@ // -// Copyright 2015 Ettus Research LLC +// Copyright 2015-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -65,8 +65,8 @@ public: _bthread.swap(t); - _sensors = boost::assign::list_of("gps_locked")("gps_time") \ - ("gps_position")("gps_gpgga")("gps_gprmc"); + _sensors = boost::assign::list_of<std::string>("gps_locked")("gps_time") \ + ("gps_position")("gps_gpgga")("gps_gprmc").to_container(_sensors); } virtual ~gpsd_iface_impl(void) |