Replaced boost::function with std::function

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index c7a81bfcd662de309ff9fa7dbbe65bec75fafafa..927b2e7c3a5e41800b0669aff04997d267e18b7d 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -21,13 +21,12 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
-#include <boost/function.hpp>
-#include <boost/thread.hpp>
-
 #include <map>
 #include <memory>
+#include <mutex>
 #include <set>
 #include <string>
+#include <thread>
 #include <vector>
 
 #include <QObject>
@@ -93,7 +92,7 @@ public:
 
        capture_state get_capture_state() const;
 
-       void start_capture(boost::function<void (const QString)> error_handler);
+       void start_capture(std::function<void (const QString)> error_handler);
 
        void stop_capture();
 
@@ -134,11 +133,11 @@ private:
 
        static sr_input* load_input_file_format(
                const std::string &filename,
-               boost::function<void (const QString)> error_handler,
+               std::function<void (const QString)> error_handler,
                sr_input_format *format = NULL);
 
        void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
-               boost::function<void (const QString)> error_handler);
+               std::function<void (const QString)> error_handler);
 
        void feed_in_header(const sr_dev_inst *sdi);
 
@@ -167,19 +166,19 @@ private:
 
        std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
 
-       mutable boost::mutex _sampling_mutex;
+       mutable std::mutex _sampling_mutex;
        capture_state _capture_state;
 
-       mutable boost::mutex _signals_mutex;
+       mutable std::mutex _signals_mutex;
        std::vector< std::shared_ptr<view::Signal> > _signals;
 
-       mutable boost::mutex _data_mutex;
+       mutable std::mutex _data_mutex;
        std::shared_ptr<data::Logic> _logic_data;
        std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
        std::map< const sr_channel*, std::shared_ptr<data::AnalogSnapshot> >
                _cur_analog_snapshots;
 
-       boost::thread _sampling_thread;
+       std::thread _sampling_thread;
 
 signals:
        void capture_state_changed(int state);