use std::move(), solving conflicts.

This commit is contained in:
Liu Ming 2015-03-24 16:41:32 +08:00
parent b4d834508c
commit 0d0ff9d961

View File

@ -2396,7 +2396,7 @@ namespace detail {
for (int block = 0; block < num_blocks; ++block) { for (int block = 0; block < num_blocks; ++block) {
fastSparseProduct(dpm_diag, p.derivative()[block], jacs[block]); fastSparseProduct(dpm_diag, p.derivative()[block], jacs[block]);
} }
return ADB::function(pm, jacs); return ADB::function(std::move(pm), std::move(jacs));
} else { } else {
return ADB::constant(V::Constant(n, 1.0), p.blockPattern()); return ADB::constant(V::Constant(n, 1.0), p.blockPattern());
} }
@ -2424,7 +2424,7 @@ namespace detail {
for (int block = 0; block < num_blocks; ++block) { for (int block = 0; block < num_blocks; ++block) {
fastSparseProduct(dtm_diag, p.derivative()[block], jacs[block]); fastSparseProduct(dtm_diag, p.derivative()[block], jacs[block]);
} }
return ADB::function(tm, jacs); return ADB::function(std::move(tm), std::move(jacs));
} else { } else {
return ADB::constant(V::Constant(n, 1.0), p.blockPattern()); return ADB::constant(V::Constant(n, 1.0), p.blockPattern());
} }