From 304f12b106c733f88df3226e98ed75c5e0ba5f54 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <frank@skyd.io>
Date: Mon, 22 Jun 2015 00:33:35 -0700
Subject: [PATCH] Small fixes for TBB/Timing path

---
 gtsam/inference/ClusterTree-inst.h       | 2 +-
 gtsam/nonlinear/NonlinearFactorGraph.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtsam/inference/ClusterTree-inst.h b/gtsam/inference/ClusterTree-inst.h
index a71ccebf9..6b28f2dbf 100644
--- a/gtsam/inference/ClusterTree-inst.h
+++ b/gtsam/inference/ClusterTree-inst.h
@@ -130,7 +130,7 @@ void ClusterTree<BAYESTREE, GRAPH>::Cluster::print(const std::string& s,
 template<class BAYESTREE, class GRAPH>
 void ClusterTree<BAYESTREE, GRAPH>::Cluster::mergeChildren(
     const std::vector<bool>& merge) {
-  gttic(Cluster::mergeChildren);
+  gttic(Cluster_mergeChildren);
 
   // Count how many keys, factors and children we'll end up with
   size_t nrKeys = orderedFrontalKeys.size();
diff --git a/gtsam/nonlinear/NonlinearFactorGraph.cpp b/gtsam/nonlinear/NonlinearFactorGraph.cpp
index 291907a73..fbc7190de 100644
--- a/gtsam/nonlinear/NonlinearFactorGraph.cpp
+++ b/gtsam/nonlinear/NonlinearFactorGraph.cpp
@@ -324,7 +324,7 @@ GaussianFactorGraph::shared_ptr NonlinearFactorGraph::linearize(const Values& li
   // linearize all factors
   BOOST_FOREACH(const sharedFactor& factor, this->factors_) {
     if(factor) {
-      (*linearFG) += factor->linearize(linearizationPoint_);
+      (*linearFG) += factor->linearize(linearizationPoint);
     } else
     (*linearFG) += GaussianFactor::shared_ptr();
   }