From 9c48415128e0789d12ebc9012bbc7050107bddcd Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Fri, 12 Jul 2013 22:27:35 +0000 Subject: [PATCH] Formatting and make_shared --- gtsam/linear/GaussianConditionalUnordered-inl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtsam/linear/GaussianConditionalUnordered-inl.h b/gtsam/linear/GaussianConditionalUnordered-inl.h index 8dfb5ba58..10e651e96 100644 --- a/gtsam/linear/GaussianConditionalUnordered-inl.h +++ b/gtsam/linear/GaussianConditionalUnordered-inl.h @@ -67,7 +67,9 @@ namespace gtsam { // Allocate combined conditional, has same keys as firstConditional Matrix tempCombined; VerticalBlockView tempBlockView(tempCombined, dims.begin(), dims.end(), 0); - GaussianConditional::shared_ptr combinedConditional(new GaussianConditional((*firstConditional)->begin(), (*firstConditional)->end(), nFrontals, tempBlockView, zero(nRows))); + GaussianConditional::shared_ptr combinedConditional = + boost::make_shared( + (*firstConditional)->begin(), (*firstConditional)->end(), nFrontals, tempBlockView, Vector::Zero(nRows)); // Resize to correct number of rows combinedConditional->matrix_.resize(nRows, combinedConditional->matrix_.cols());