Update from DSLogic-v0.3.tar.gzHEADmaster

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/DSLogic-gui/pv/decoder/dsspi.cpp b/DSLogic-gui/pv/decoder/dsspi.cpp
index 88ff8db..3b95507 100644
--- a/DSLogic-gui/pv/decoder/dsspi.cpp
+++ b/DSLogic-gui/pv/decoder/dsspi.cpp
@@ -45,7 +45,7 @@ const QString dsSpi::StateTable[TableSize] = {
     "DATA"
 };
 
-dsSpi::dsSpi(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+dsSpi::dsSpi(boost::shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
     Decoder(data, _sel_probes, _options_index)
 {
     _cpol = _options.value("cpol").toBool();
@@ -125,12 +125,12 @@ void dsSpi::decode()
     _max_width = 0;
     uint8_t cur_state = Unknown;
 
-    const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+    const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
         _data->get_snapshots();
     if (snapshots.empty())
         return;
 
-    const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+    const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
         snapshots.front();
 
     const uint64_t ssn_mask = 1ULL << _ssn_index;
@@ -191,7 +191,7 @@ void dsSpi::decode()
     }
 }
 
-void dsSpi::data_decode(const shared_ptr<data::LogicSnapshot> &snapshot)
+void dsSpi::data_decode(const boost::shared_ptr<data::LogicSnapshot> &snapshot)
 {
     uint8_t cur_state;
     const uint8_t *src_ptr;
@@ -256,11 +256,11 @@ void dsSpi::get_subsampled_states(std::vector<struct ds_view_state> &states,
 {
     ds_view_state view_state;
 
-    const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+    const deque< boost::shared_ptr<pv::data::LogicSnapshot> > &snapshots =
         _data->get_snapshots();
     if (snapshots.empty())
         return;
-    const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+    const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot =
         snapshots.front();
 
     assert(end <= snapshot->get_sample_count());