File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ template <typename T> class variable {
94
94
public:
95
95
variable () = default ;
96
96
template <typename U> variable (view<U> const &val);
97
- virtual ~variable () = default ;
97
+ ~variable () = default ;
98
98
99
99
variable (variable &&) = default ;
100
100
variable &operator =(variable &&) = default ;
@@ -117,7 +117,7 @@ template <typename Val> class observable {
117
117
* @brief Constructor out of a variable.
118
118
*/
119
119
observable (variable<Val> const &obs);
120
- virtual ~observable () = default ;
120
+ ~observable () = default ;
121
121
122
122
/* *
123
123
* @brief Compute and retrieve the value of the column.
Original file line number Diff line number Diff line change @@ -429,14 +429,14 @@ void queryosity::lazy<Action>::merge_results() {
429
429
using result_type = decltype (model->result ());
430
430
const auto nslots = this ->size ();
431
431
if (nslots == 1 ) {
432
- this ->m_result = model->result ();
432
+ this ->m_result = std::move ( model->result () );
433
433
} else {
434
434
std::vector<result_type> results;
435
435
results.reserve (nslots);
436
436
for (size_t islot = 0 ; islot < nslots; ++islot) {
437
437
results.push_back (std::move (this ->get_slot (islot)->result ()));
438
438
}
439
- this ->m_result = model->merge (results);
439
+ this ->m_result = std::move ( model->merge (results) );
440
440
}
441
441
this ->m_merged = true ;
442
442
}
You can’t perform that action at this time.
0 commit comments