Fixed more warnings
parent
eb4659bcb6
commit
ca80678ffc
|
@ -206,7 +206,7 @@ int main(int argc, char *argv[]) {
|
|||
}
|
||||
|
||||
#ifdef GTSAM_USE_TBB
|
||||
std::auto_ptr<tbb::task_scheduler_init> init;
|
||||
std::unique_ptr<tbb::task_scheduler_init> init;
|
||||
if(nThreads > 0) {
|
||||
cout << "Using " << nThreads << " threads" << endl;
|
||||
init.reset(new tbb::task_scheduler_init(nThreads));
|
||||
|
|
|
@ -1368,8 +1368,7 @@ void gk_csr_Normalize(gk_csr_t *mat, int what, int norm)
|
|||
sum = 1.0 / sqrt(sum);
|
||||
else if (norm == 1)
|
||||
sum = 1.0 / sum;
|
||||
for (j=ptr[i]; j<ptr[i+1]; j++)
|
||||
val[j] *= sum;
|
||||
for (j = ptr[i]; j < ptr[i + 1]; j++) val[j] *= sum;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -111,8 +111,9 @@ bool choleskyPartial(Matrix& ABC, size_t nFrontal, size_t topleft) {
|
|||
return true;
|
||||
|
||||
assert(ABC.cols() == ABC.rows());
|
||||
const Eigen::DenseIndex n = ABC.rows() - topleft;
|
||||
assert(n >= 0 && nFrontal <= size_t(n));
|
||||
assert(ABC.rows() >= topleft);
|
||||
const size_t n = static_cast<size_t>(ABC.rows() - topleft);
|
||||
assert(nFrontal <= size_t(n));
|
||||
|
||||
// Create views on blocks
|
||||
auto A = ABC.block(topleft, topleft, nFrontal, nFrontal);
|
||||
|
|
Loading…
Reference in New Issue