From 31edd6a85f52c855d54594dc9f8ceda694d3ebea Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 1 Aug 2015 17:18:24 +0200
Subject: Switch to C++11, remove boost::shared_ptr

---
 src/OutputUHD.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/OutputUHD.h')

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();
 
-- 
cgit v1.2.3