projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix two errors with clang 3.6.
[pulseview.git]
/
pv
/
storesession.h
diff --git
a/pv/storesession.h
b/pv/storesession.h
index 4c9eae0160d7588a3543062528610d775dea0d3c..ffe1facd742c9b5a194ed4bb75fc2e69f4e4b40e 100644
(file)
--- a/
pv/storesession.h
+++ b/
pv/storesession.h
@@
-51,7
+51,7
@@
public:
~StoreSession();
~StoreSession();
- std::pair<
uint64_t, uint64_
t> progress() const;
+ std::pair<
int, in
t> progress() const;
const QString& error() const;
const QString& error() const;
@@
-75,9
+75,9
@@
private:
std::atomic<bool> _interrupt;
std::atomic<bool> _interrupt;
+ std::atomic<int> _units_stored, _unit_count;
+
mutable std::mutex _mutex;
mutable std::mutex _mutex;
- uint64_t _units_stored;
- uint64_t _unit_count;
QString _error;
};
QString _error;
};