diff --git a/base/timing.h b/base/timing.h index 77a19ce86..52dcec6b9 100644 --- a/base/timing.h +++ b/base/timing.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include // simple class for accumulating execution timing information by name diff --git a/inference/Factor.cpp b/inference/Factor.cpp index fdea99678..a646f8130 100644 --- a/inference/Factor.cpp +++ b/inference/Factor.cpp @@ -47,7 +47,7 @@ Conditional::shared_ptr Factor::eliminateFirst() { boost::shared_ptr > Factor::eliminate(varid_t nFrontals) { assert(keys_.size() >= nFrontals); checkSorted(); - typename BayesNet::shared_ptr fragment(new BayesNet()); + BayesNet::shared_ptr fragment(new BayesNet()); const_iterator nextFrontal = this->begin(); for(varid_t n = 0; n < nFrontals; ++n, ++nextFrontal) fragment->push_back(Conditional::shared_ptr(new Conditional(nextFrontal, const_iterator(this->end()), 1))); diff --git a/inference/inference.cpp b/inference/inference.cpp index f853cce38..2b3cb7ec4 100644 --- a/inference/inference.cpp +++ b/inference/inference.cpp @@ -18,8 +18,8 @@ Inference::EliminateOneSymbolic(FactorGraph& factorGraph, VariableIndex< tic("EliminateOne"); // Get the factors involving the eliminated variable - typename VariableIndex<>::mapped_type& varIndexEntry(variableIndex[var]); - typedef typename VariableIndex<>::mapped_factor_type mapped_factor_type; + VariableIndex<>::mapped_type& varIndexEntry(variableIndex[var]); + typedef VariableIndex<>::mapped_factor_type mapped_factor_type; if(!varIndexEntry.empty()) { diff --git a/linear/GaussianJunctionTree.cpp b/linear/GaussianJunctionTree.cpp index 85f91fb9b..e1568acf2 100644 --- a/linear/GaussianJunctionTree.cpp +++ b/linear/GaussianJunctionTree.cpp @@ -1,4 +1,4 @@ -/* +/** * GaussianJunctionTree.cpp * Created on: Jul 12, 2010 * @author Kai Ni @@ -34,7 +34,7 @@ namespace gtsam { } // solve the bayes nets in the child nodes - BOOST_FOREACH(const typename BayesTree::sharedClique& child, current->children()) { + BOOST_FOREACH(const BayesTree::sharedClique& child, current->children()) { btreeBackSubstitue(child, config); } }