From 1df2f0f5d704f0cc458cf707e2602d495979e3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Piltz?= Date: Wed, 7 May 2014 11:10:30 +0200 Subject: [PATCH] Removed MSVC warnings These are warnings which show up when using Ceres. Change-Id: Id1f382f46b8a60743f0b12535b5b3cdf46f988e0 --- include/ceres/fpclassify.h | 6 +++--- include/ceres/local_parameterization.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ceres/fpclassify.h b/include/ceres/fpclassify.h index e7f0d7ced..da8a4d086 100644 --- a/include/ceres/fpclassify.h +++ b/include/ceres/fpclassify.h @@ -47,9 +47,9 @@ namespace ceres { #if defined(_MSC_VER) -inline bool IsFinite (double x) { return _finite(x); } -inline bool IsInfinite(double x) { return !_finite(x) && !_isnan(x); } -inline bool IsNaN (double x) { return _isnan(x); } +inline bool IsFinite (double x) { return _finite(x) != 0; } +inline bool IsInfinite(double x) { return _finite(x) == 0 && _isnan(x) == 0; } +inline bool IsNaN (double x) { return _isnan(x) != 0; } inline bool IsNormal (double x) { int classification = _fpclass(x); return classification == _FPCLASS_NN || diff --git a/include/ceres/local_parameterization.h b/include/ceres/local_parameterization.h index 3ecd9593a..0d74087ae 100644 --- a/include/ceres/local_parameterization.h +++ b/include/ceres/local_parameterization.h @@ -160,7 +160,7 @@ class CERES_EXPORT SubsetParameterization : public LocalParameterization { double* x_plus_delta) const; virtual bool ComputeJacobian(const double* x, double* jacobian) const; - virtual int GlobalSize() const { return constancy_mask_.size(); } + virtual int GlobalSize() const { return static_cast(constancy_mask_.size()); } virtual int LocalSize() const { return local_size_; } private: