Fixed a couple errors and warnings

release/4.3a0
Richard Roberts 2013-08-07 21:57:25 +00:00
parent 4d357fd639
commit 6556fb5b1e
3 changed files with 3 additions and 2 deletions

View File

@ -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;
}
}

View File

@ -14,6 +14,7 @@
#include <gtsam/global_includes.h>
#include <string>
#include <iostream>
namespace gtsam {

View File

@ -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;