summaryrefslogtreecommitdiffstats
path: root/src/OutputUHD.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-08-01 17:18:24 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-08-01 17:18:24 +0200
commit31edd6a85f52c855d54594dc9f8ceda694d3ebea (patch)
tree60ad2c84d28a495082e0b083e072a934bc142634 /src/OutputUHD.h
parent1c25545bb03ea074b5871be3234bf0d1be20a6a3 (diff)
downloaddabmod-31edd6a85f52c855d54594dc9f8ceda694d3ebea.tar.gz
dabmod-31edd6a85f52c855d54594dc9f8ceda694d3ebea.tar.bz2
dabmod-31edd6a85f52c855d54594dc9f8ceda694d3ebea.zip
Switch to C++11, remove boost::shared_ptr
Diffstat (limited to 'src/OutputUHD.h')
-rw-r--r--src/OutputUHD.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/OutputUHD.h b/src/OutputUHD.h
index 8234340..88be215 100644
--- a/src/OutputUHD.h
+++ b/src/OutputUHD.h
@@ -49,8 +49,8 @@ DESCRIPTION:
#include <uhd/usrp/multi_usrp.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/barrier.hpp>
-#include <boost/shared_ptr.hpp>
#include <list>
+#include <memory>
#include <string>
#include "Log.h"
@@ -127,7 +127,7 @@ struct UHDWorkerData {
bool muting;
// A barrier to synchronise the two threads
- boost::shared_ptr<boost::barrier> sync_barrier;
+ std::shared_ptr<boost::barrier> sync_barrier;
// What to do when the reference clock PLL loses lock
refclk_lock_loss_behaviour_t refclk_lock_loss_behaviour;
@@ -247,7 +247,7 @@ class OutputUHD: public ModOutput, public RemoteControllable {
EtiReader *myEtiReader;
OutputUHDConfig myConf;
uhd::usrp::multi_usrp::sptr myUsrp;
- boost::shared_ptr<boost::barrier> mySyncBarrier;
+ std::shared_ptr<boost::barrier> mySyncBarrier;
UHDWorker worker;
bool first_run;
bool gps_fix_verified;
@@ -281,7 +281,7 @@ class OutputUHD: public ModOutput, public RemoteControllable {
static const int initial_gps_fix_wait = 180;
// Interval for checking the GPS at runtime
- static const double gps_fix_check_interval = 10.0; // seconds
+ static constexpr double gps_fix_check_interval = 10.0; // seconds
void check_gps();