projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::shared_ptr with std::shared_ptr
[pulseview.git]
/
pv
/
data
/
decoderstack.h
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 9c960e589972c1dd9492da78984992660ca79b86..1badc6b9b34988aafb41265b54d9b5681be64852 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-24,9
+24,9
@@
#include "signaldata.h"
#include <list>
#include "signaldata.h"
#include <list>
+#include <memory>
#include <boost/optional.hpp>
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <QObject>
#include <boost/thread.hpp>
#include <QObject>
@@
-37,7
+37,7
@@
struct srd_decoder;
struct srd_decoder_annotation_row;
struct srd_decoder;
struct srd_decoder_annotation_row;
-struct srd_
probe
;
+struct srd_
channel
;
struct srd_proto_data;
struct srd_session;
struct srd_proto_data;
struct srd_session;
@@
-72,6
+72,7
@@
private:
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
+ static const unsigned int DecodeNotifyPeriod;
public:
DecoderStack(pv::SigSession &_session,
public:
DecoderStack(pv::SigSession &_session,
@@
-79,8
+80,8
@@
public:
virtual ~DecoderStack();
virtual ~DecoderStack();
- const std::list<
boost
::shared_ptr<decode::Decoder> >& stack() const;
- void push(
boost
::shared_ptr<decode::Decoder> decoder);
+ const std::list<
std
::shared_ptr<decode::Decoder> >& stack() const;
+ void push(
std
::shared_ptr<decode::Decoder> decoder);
void remove(int index);
int64_t samples_decoded() const;
void remove(int index);
int64_t samples_decoded() const;
@@
-135,9
+136,9
@@
private:
*/
static boost::mutex _global_decode_mutex;
*/
static boost::mutex _global_decode_mutex;
- std::list<
boost
::shared_ptr<decode::Decoder> > _stack;
+ std::list<
std
::shared_ptr<decode::Decoder> > _stack;
-
boost
::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+
std
::shared_ptr<pv::data::LogicSnapshot> _snapshot;
mutable boost::mutex _input_mutex;
mutable boost::condition_variable _input_cond;
mutable boost::mutex _input_mutex;
mutable boost::condition_variable _input_cond;