comparison: src/list.h
src/list.h
- changeset 142
- 1f5518dd8146
- parent 139
- cf11621ae422
equal
deleted
inserted
replaced
| 141:68d60e2cfa76 | 142:1f5518dd8146 |
|---|---|
| 182 } | 182 } |
| 183 | 183 |
| 184 template<typename T> | 184 template<typename T> |
| 185 void List<T>::merge (const List<T>& other) | 185 void List<T>::merge (const List<T>& other) |
| 186 { | 186 { |
| 187 int oldsize = size(); | |
| 187 resize (size() + other.size()); | 188 resize (size() + other.size()); |
| 188 std::copy (other.begin(), other.end(), begin() + other.size()); | 189 std::copy (other.begin(), other.end(), begin() + oldsize); |
| 189 } | 190 } |
| 190 | 191 |
| 191 template<typename T> | 192 template<typename T> |
| 192 bool List<T>::pop (T& val) | 193 bool List<T>::pop (T& val) |
| 193 { | 194 { |
