From 880cba0939b2caa2641a5752373ffd47b64edd0f Mon Sep 17 00:00:00 2001 From: Petter Strandmark Date: Fri, 16 Aug 2013 20:05:30 +0200 Subject: [PATCH] Fix warning C4373 in Visual Studio The warning occurs because an overridden function added a const to one argument. Change-Id: Idd24f7c6ab60064747104bfc75ae9bf112f61b3e --- internal/ceres/line_search.cc | 2 +- internal/ceres/line_search.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/ceres/line_search.cc b/internal/ceres/line_search.cc index 39618b575..832389691 100644 --- a/internal/ceres/line_search.cc +++ b/internal/ceres/line_search.cc @@ -112,7 +112,7 @@ void LineSearchFunction::Init(const Vector& position, direction_ = direction; } -bool LineSearchFunction::Evaluate(const double x, double* f, double* g) { +bool LineSearchFunction::Evaluate(double x, double* f, double* g) { scaled_direction_ = x * direction_; if (!evaluator_->Plus(position_.data(), scaled_direction_.data(), diff --git a/internal/ceres/line_search.h b/internal/ceres/line_search.h index e4836b24e..5f24e9fd7 100644 --- a/internal/ceres/line_search.h +++ b/internal/ceres/line_search.h @@ -231,7 +231,7 @@ class LineSearchFunction : public LineSearch::Function { explicit LineSearchFunction(Evaluator* evaluator); virtual ~LineSearchFunction() {} void Init(const Vector& position, const Vector& direction); - virtual bool Evaluate(const double x, double* f, double* g); + virtual bool Evaluate(double x, double* f, double* g); double DirectionInfinityNorm() const; private: