12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compile bug due to typename keyword appearing outside of templates

release/4.3a0
Alex Cunningham 2010-12-03 14:28:25 +00:00
parent b55b9de27f
commit 19928a9f37
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/inference/IndexFactor.cpp
View File

@ -28,9 +28,9 @@ template class FactorBase<Index>;
IndexFactor::IndexFactor(const IndexConditional& c) : Base(static_cast<const Base>(c)) {} IndexFactor::IndexFactor(const IndexConditional& c) : Base(static_cast<const Base>(c)) {}
pair<typename BayesNet<IndexConditional>::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate( pair<BayesNet<IndexConditional>::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate(
const FactorGraph<This>& factors, size_t nrFrontals) { const FactorGraph<This>& factors, size_t nrFrontals) {
pair<typename BayesNet<Conditional>::shared_ptr, shared_ptr> result; pair<BayesNet<Conditional>::shared_ptr, shared_ptr> result;
result.second = Combine(factors, VariableSlots(factors)); result.second = Combine(factors, VariableSlots(factors));
result.first = result.second->eliminate(nrFrontals); result.first = result.second->eliminate(nrFrontals);
return result; return result;

2
gtsam/inference/IndexFactor.h
View File

@ -65,7 +65,7 @@ public:
/** /**
* Combine and eliminate several factors. * Combine and eliminate several factors.
*/ */
static std::pair<typename BayesNet<Conditional>::shared_ptr, shared_ptr> CombineAndEliminate( static std::pair<BayesNet<Conditional>::shared_ptr, shared_ptr> CombineAndEliminate(
const FactorGraph<This>& factors, size_t nrFrontals=1); const FactorGraph<This>& factors, size_t nrFrontals=1);
/** Create a combined joint factor (new style for EliminationTree). */ /** Create a combined joint factor (new style for EliminationTree). */