From 6556fb5b1eac7aa6d0e7e9c49d0c72153bf61b16 Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Wed, 7 Aug 2013 21:57:25 +0000
Subject: [PATCH] Fixed a couple errors and warnings

---
 gtsam/inference/EliminationTree-inst.h | 2 +-
 gtsam/linear/IterativeSolver.h         | 1 +
 gtsam/linear/JacobianFactor.cpp        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtsam/inference/EliminationTree-inst.h b/gtsam/inference/EliminationTree-inst.h
index d8791d1ba..617fb6e0e 100644
--- a/gtsam/inference/EliminationTree-inst.h
+++ b/gtsam/inference/EliminationTree-inst.h
@@ -251,7 +251,7 @@ namespace gtsam {
           if(*it1 && *it2) {
             if(!(*it1)->equals(**it2, tol))
               return false;
-          } else if(*it1 && !*it2 || *it2 && !*it1) {
+          } else if((*it1 && !*it2) || (*it2 && !*it1)) {
             return false;
           }
         }
diff --git a/gtsam/linear/IterativeSolver.h b/gtsam/linear/IterativeSolver.h
index c019aaa69..988293a4f 100644
--- a/gtsam/linear/IterativeSolver.h
+++ b/gtsam/linear/IterativeSolver.h
@@ -14,6 +14,7 @@
 #include <gtsam/global_includes.h>
 
 #include <string>
+#include <iostream>
 
 namespace gtsam {
 
diff --git a/gtsam/linear/JacobianFactor.cpp b/gtsam/linear/JacobianFactor.cpp
index e94d860fc..a7f1dbcb1 100644
--- a/gtsam/linear/JacobianFactor.cpp
+++ b/gtsam/linear/JacobianFactor.cpp
@@ -355,7 +355,7 @@ namespace gtsam {
         return false;
 
       // Check noise model
-      if(model_ && !f.model_ || !model_ && f.model_)
+      if((model_ && !f.model_) || (!model_ && f.model_))
         return false;
       if(model_ && f.model_ && !model_->equals(*f.model_, tol))
         return false;