From b3a0802c93f94d21b9d1cf5ed9447da220f68583 Mon Sep 17 00:00:00 2001 From: indelman Date: Sat, 1 Feb 2014 09:28:04 -0500 Subject: [PATCH] Removed typename in shared_ptr declaration. --- gtsam/navigation/CombinedImuFactor.h | 7 ++----- gtsam/navigation/ImuFactor.h | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gtsam/navigation/CombinedImuFactor.h b/gtsam/navigation/CombinedImuFactor.h index f7e3cfec8..1a4ddd6ff 100644 --- a/gtsam/navigation/CombinedImuFactor.h +++ b/gtsam/navigation/CombinedImuFactor.h @@ -342,11 +342,8 @@ namespace gtsam { public: /** Shorthand for a smart pointer to a factor */ -#ifndef _MSC_VER - typedef typename boost::shared_ptr shared_ptr; -#else - typedef boost::shared_ptr shared_ptr; -#endif + typedef boost::shared_ptr shared_ptr; + /** Default constructor - only use for serialization */ CombinedImuFactor() : preintegratedMeasurements_(imuBias::ConstantBias(), Matrix3::Zero(), Matrix3::Zero(), Matrix3::Zero(), Matrix3::Zero(), Matrix3::Zero(), Matrix::Zero(6,6)) {} diff --git a/gtsam/navigation/ImuFactor.h b/gtsam/navigation/ImuFactor.h index bd8a0f80b..38e23d4a9 100644 --- a/gtsam/navigation/ImuFactor.h +++ b/gtsam/navigation/ImuFactor.h @@ -304,11 +304,8 @@ namespace gtsam { public: /** Shorthand for a smart pointer to a factor */ -#ifndef _MSC_VER - typedef typename boost::shared_ptr shared_ptr; -#else typedef boost::shared_ptr shared_ptr; -#endif + /** Default constructor - only use for serialization */ ImuFactor() : preintegratedMeasurements_(imuBias::ConstantBias(), Matrix3::Zero(), Matrix3::Zero(), Matrix3::Zero()) {}