commit dd1a276561b3b224b9875e1cbdab2e73e2a55dd0
author Petter Strandmark <petter.strandmark@gmail.com> Wed Sep 19 12:55:05 2012 +0200
committer Petter Strandmark <petter.strandmark@gmail.com> Wed Sep 19 13:01:02 2012 +0200
tree c3d4c1cb8fe1c26428037b2d21086126efaceb75
parent 97ca0fbbead79abfe6aaf4dc41c12d0a4b4a2edc

Fix of compilation errors in solver_impl.cc

They appear is SuiteSparse is disabled.

Change-Id: I2c2e9dac49afe81ddb810b546135621b325c2c97

internal/ceres/solver_impl.cc

diff --git a/internal/ceres/solver_impl.cc b/internal/ceres/solver_impl.cc
index 7e90c9b..e16b6a0 100644
--- a/internal/ceres/solver_impl.cc
+++ b/internal/ceres/solver_impl.cc
@@ -646,19 +646,19 @@
     return NULL;
   }
 
-  if (linear_solver_options.preconditioner_type == SCHUR_JACOBI) {
+  if (options->preconditioner_type == SCHUR_JACOBI) {
     *error =  "SCHUR_JACOBI preconditioner not suppored. Please build Ceres "
         "with SuiteSparse support.";
     return NULL;
   }
 
-  if (linear_solver_options.preconditioner_type == CLUSTER_JACOBI) {
+  if (options->preconditioner_type == CLUSTER_JACOBI) {
     *error =  "CLUSTER_JACOBI preconditioner not suppored. Please build Ceres "
         "with SuiteSparse support.";
     return NULL;
   }
 
-  if (linear_solver_options.preconditioner_type == CLUSTER_TRIDIAGONAL) {
+  if (options->preconditioner_type == CLUSTER_TRIDIAGONAL) {
     *error =  "CLUSTER_TRIDIAGONAL preconditioner not suppored. Please build "
         "Ceres with SuiteSparse support.";
     return NULL;
@@ -761,7 +761,7 @@
       program->mutable_parameter_blocks();
   parameter_blocks->clear();
 
-  const ProblemImpl::ProblemImpl::ParameterMap& parameter_map =
+  const ProblemImpl::ParameterMap& parameter_map =
       problem_impl.parameter_map();
   const map<int, set<double*> >& groups =
       ordering->group_id_to_parameter_blocks();