aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/gpsd_iface.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2016-06-22 15:33:57 -0700
committerMartin Braun <martin.braun@ettus.com>2016-06-22 15:33:57 -0700
commitfd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f (patch)
tree0af522f474deae9e3172094ea17ee5f0376acb7d /host/lib/usrp/gpsd_iface.cpp
parentf693349f12a66cfad2159779757e2ea1d6d483be (diff)
parentf28a52b652d4234aa88db7c2df80f8b4a6ce6535 (diff)
downloaduhd-fd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f.tar.gz
uhd-fd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f.tar.bz2
uhd-fd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f.zip
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/gpsd_iface.cpp')
-rw-r--r--host/lib/usrp/gpsd_iface.cpp6
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)