From cb83b2801e7a62dce6c1cd5431de2becf8aef05f Mon Sep 17 00:00:00 2001
From: Sameer Agarwal <sameeragarwal@google.com>
Date: Wed, 6 Jun 2012 22:26:09 -0700
Subject: [PATCH] Fix broken build. Fix broken build and verbosity issues.

1. While cleaning up the last CL, I broke a macro.
2. cholmod_common_print was being called too often.

Change-Id: Ia76d8863c72f31b0c02977094b22035ceef835cf
---
 internal/ceres/schur_complement_solver.cc         | 6 +++---
 internal/ceres/sparse_normal_cholesky_solver.cc   | 6 +++---
 internal/ceres/suitesparse_test.cc                | 2 +-
 internal/ceres/visibility_based_preconditioner.cc | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/internal/ceres/schur_complement_solver.cc b/internal/ceres/schur_complement_solver.cc
index 5679a099c..f7597e04a 100644
--- a/internal/ceres/schur_complement_solver.cc
+++ b/internal/ceres/schur_complement_solver.cc
@@ -287,10 +287,10 @@ bool SparseSchurComplementSolver::SolveReducedLinearSystemUsingSuiteSparse(
     } else {
       factor_ = ss_.AnalyzeCholesky(cholmod_lhs);
     }
-  }
 
-  if (VLOG_IS_ON(2)) {
-    cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
+    if (VLOG_IS_ON(2)) {
+      cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
+    }
   }
 
   CHECK_NOTNULL(factor_);
diff --git a/internal/ceres/sparse_normal_cholesky_solver.cc b/internal/ceres/sparse_normal_cholesky_solver.cc
index 4191f3c8c..448bbd5bc 100644
--- a/internal/ceres/sparse_normal_cholesky_solver.cc
+++ b/internal/ceres/sparse_normal_cholesky_solver.cc
@@ -189,10 +189,10 @@ LinearSolver::Summary SparseNormalCholeskySolver::SolveImplUsingSuiteSparse(
     } else {
       factor_ = ss_.AnalyzeCholesky(lhs.get());
     }
-  }
 
-  if (VLOG_IS_ON(2)) {
-    cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
+    if (VLOG_IS_ON(2)) {
+      cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
+    }
   }
 
   CHECK_NOTNULL(factor_);
diff --git a/internal/ceres/suitesparse_test.cc b/internal/ceres/suitesparse_test.cc
index 9211788c2..0dc418f2b 100644
--- a/internal/ceres/suitesparse_test.cc
+++ b/internal/ceres/suitesparse_test.cc
@@ -135,7 +135,7 @@ TEST(SuiteSparse, ScalarMatrixToBlockMatrix) {
   fill(tsm.mutable_values(), tsm.mutable_values() + 15, 1.0);
   int offset = 0;
 
-#define CERES_TEST_FILL_BLOCK(r, c) \
+#define CERES_TEST_FILL_BLOCK(row_block_id, col_block_id) \
   offset += FillBlock(row_blocks, col_blocks, \
                       row_block_id, col_block_id, \
                       rows + offset, cols + offset);
diff --git a/internal/ceres/visibility_based_preconditioner.cc b/internal/ceres/visibility_based_preconditioner.cc
index 5a0100621..749aa2f11 100644
--- a/internal/ceres/visibility_based_preconditioner.cc
+++ b/internal/ceres/visibility_based_preconditioner.cc
@@ -453,10 +453,10 @@ bool VisibilityBasedPreconditioner::Factorize() {
     } else {
       factor_ = ss_.AnalyzeCholesky(lhs);
     }
-  }
 
-  if (VLOG_IS_ON(2)) {
-    cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
+    if (VLOG_IS_ON(2)) {
+      cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
+    }
   }
 
   CHECK_NOTNULL(factor_);