ZYM/STLite-ACM-2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix(vector): bugs of move constructor/assignment in supporting files."

Browse Source 
This reverts commit 5c9346830c.
This commit is contained in:
Wankupi
2024-02-26 11:01:15 +08:00
parent 5c9346830c
commit 4b35504160
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vector/data/class-matrix.hpp
View File

@ -41,7 +41,7 @@ public:
Matrix(const Matrix<_Td> &mat) Matrix(const Matrix<_Td> &mat)
: n_rows(mat.n_rows), n_cols(mat.n_cols), data(mat.data) {} : n_rows(mat.n_rows), n_cols(mat.n_cols), data(mat.data) {}
Matrix(Matrix<_Td> &&mat) noexcept Matrix(Matrix<_Td> &&mat) noexcept
: n_rows(mat.n_rows), n_cols(mat.n_cols), data(std::move(mat.data)) {} : n_rows(mat.n_rows), n_cols(mat.n_cols), data(mat.data) {}
Matrix<_Td> & operator=(const Matrix<_Td> &rhs) Matrix<_Td> & operator=(const Matrix<_Td> &rhs)
{ {
this->n_rows = rhs.n_rows; this->n_rows = rhs.n_rows;
@ -53,7 +53,7 @@ public:
{ {
this->n_rows = rhs.n_rows; this->n_rows = rhs.n_rows;
this->n_cols = rhs.n_cols; this->n_cols = rhs.n_cols;
this->data = std::move(rhs.data); this->data = rhs.data;
return *this; return *this;
} }
inline const size_t & RowSize() const inline const size_t & RowSize() const

4
vector/src/utility.hpp
View File

@ -15,11 +15,11 @@ public:
pair(pair &&other) = default; pair(pair &&other) = default;
pair(const T1 &x, const T2 &y) : first(x), second(y) {} pair(const T1 &x, const T2 &y) : first(x), second(y) {}
template<class U1, class U2> template<class U1, class U2>
pair(U1 &&x, U2 &&y) : first(std::move(x)), second(std::move(y)) {} pair(U1 &&x, U2 &&y) : first(x), second(y) {}
template<class U1, class U2> template<class U1, class U2>
pair(const pair<U1, U2> &other) : first(other.first), second(other.second) {} pair(const pair<U1, U2> &other) : first(other.first), second(other.second) {}
template<class U1, class U2> template<class U1, class U2>
pair(pair<U1, U2> &&other) : first(std::move(other.first)), second(std::move(other.second)) {} pair(pair<U1, U2> &&other) : first(other.first), second(other.second) {}
}; };
} }