Browse Source

Merge #9349: Make CScript (and prevector) c++11 movable.

2ddfcfd Make CScript (and prevector) c++11 movable. (Pieter Wuille)
0.14
Pieter Wuille 8 years ago
parent
commit
2db4cbcc43
No known key found for this signature in database
GPG Key ID: DBA1A67379A1A931
  1. 9
      src/prevector.h
  2. 1
      src/script/script.h
  3. 21
      src/test/prevector_tests.cpp

9
src/prevector.h

@ -248,6 +248,10 @@ public: @@ -248,6 +248,10 @@ public:
}
}
prevector(prevector<N, T, Size, Diff>&& other) : _size(0) {
swap(other);
}
prevector& operator=(const prevector<N, T, Size, Diff>& other) {
if (&other == this) {
return *this;
@ -263,6 +267,11 @@ public: @@ -263,6 +267,11 @@ public:
return *this;
}
prevector& operator=(prevector<N, T, Size, Diff>&& other) {
swap(other);
return *this;
}
size_type size() const {
return is_direct() ? _size : _size - N - 1;
}

1
src/script/script.h

@ -394,7 +394,6 @@ protected: @@ -394,7 +394,6 @@ protected:
}
public:
CScript() { }
CScript(const CScript& b) : CScriptBase(b.begin(), b.end()) { }
CScript(const_iterator pbegin, const_iterator pend) : CScriptBase(pbegin, pend) { }
CScript(std::vector<unsigned char>::const_iterator pbegin, std::vector<unsigned char>::const_iterator pend) : CScriptBase(pbegin, pend) { }
CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { }

21
src/test/prevector_tests.cpp

@ -169,6 +169,19 @@ public: @@ -169,6 +169,19 @@ public:
pre_vector.swap(pre_vector_alt);
test();
}
void move() {
real_vector = std::move(real_vector_alt);
real_vector_alt.clear();
pre_vector = std::move(pre_vector_alt);
pre_vector_alt.clear();
}
void copy() {
real_vector = real_vector_alt;
pre_vector = pre_vector_alt;
}
~prevector_tester() {
BOOST_CHECK_MESSAGE(passed, "insecure_rand_Rz: "
<< rand_cache.Rz
@ -240,9 +253,15 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) @@ -240,9 +253,15 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt)
if (((r >> 21) % 512) == 12) {
test.assign(insecure_rand() % 32, insecure_rand());
}
if (((r >> 15) % 64) == 3) {
if (((r >> 15) % 8) == 3) {
test.swap();
}
if (((r >> 15) % 16) == 8) {
test.copy();
}
if (((r >> 15) % 32) == 18) {
test.move();
}
}
}
}

Loading…
Cancel
Save