Update from DSLogic-v0.3.tar.gzHEADmaster

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

1 files changed, 5 insertions, 5 deletions

diff --git a/DSLogic-gui/pv/decoder/ds1wire.cpp b/DSLogic-gui/pv/decoder/ds1wire.cpp
index 1f8d759..04d3ec3 100644
--- a/DSLogic-gui/pv/decoder/ds1wire.cpp
+++ b/DSLogic-gui/pv/decoder/ds1wire.cpp
@@ -53,7 +53,7 @@ const QString ds1Wire::StateTable[TableSize] = {
     "DATA"
 };
 
-ds1Wire::ds1Wire(shared_ptr<data::Logic> data, std::list <int > _sel_probes, QMap<QString, QVariant> &_options, QMap<QString, int> _options_index) :
+ds1Wire::ds1Wire(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)
 {
     (void)_options;
@@ -91,12 +91,12 @@ void ds1Wire::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();
 
     uint64_t flag_index1;
@@ -336,11 +336,11 @@ void ds1Wire::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());