projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed C++ headers to .hpp
[pulseview.git]
/
test
/
data
/
decoderstack.cpp
diff --git
a/test/data/decoderstack.cpp
b/test/data/decoderstack.cpp
index d6e4f75a8a898dbbf3aea473690dcffdbbdbfb71..09f047d5d07549ce4d4e928f74d4801af2509e34 100644
(file)
--- a/
test/data/decoderstack.cpp
+++ b/
test/data/decoderstack.cpp
@@
-28,10
+28,10
@@
#include "../../pv/sigsession.h"
#include "../../pv/view/decodetrace.h"
#include "../../pv/sigsession.h"
#include "../../pv/view/decodetrace.h"
-using boost::shared_ptr;
using pv::data::DecoderStack;
using pv::data::decode::Decoder;
using pv::view::DecodeTrace;
using pv::data::DecoderStack;
using pv::data::decode::Decoder;
using pv::view::DecodeTrace;
+using std::shared_ptr;
using std::vector;
BOOST_AUTO_TEST_SUITE(DecoderStackTest)
using std::vector;
BOOST_AUTO_TEST_SUITE(DecoderStackTest)
@@
-70,8
+70,8
@@
BOOST_AUTO_TEST_CASE(TwoDecoderStack)
BOOST_REQUIRE(dec1);
// Wait for the decode threads to complete
BOOST_REQUIRE(dec1);
// Wait for the decode threads to complete
- dec0->
_decode_thread
.join();
- dec1->
_decode_thread
.join();
+ dec0->
decode_thread_
.join();
+ dec1->
decode_thread_
.join();
// Check there were no errors
BOOST_CHECK_EQUAL(dec0->error_message().isEmpty(), true);
// Check there were no errors
BOOST_CHECK_EQUAL(dec0->error_message().isEmpty(), true);