- mutable boost::mutex _data_mutex;
- boost::shared_ptr<data::Logic> _logic_data;
- boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
- boost::shared_ptr<data::Analog> _analog_data;
- boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+ mutable std::mutex data_mutex_;
+ std::shared_ptr<data::Logic> logic_data_;
+ std::shared_ptr<data::LogicSnapshot> cur_logic_snapshot_;
+ std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
+ cur_analog_snapshots_;