Merge pull request #1631 from borglab/fix-1614

Fix Matlab compilation for discrete.i
borglab · Sep 8, 2023 · f4bec21 · f4bec21
2 parents 271b9f3 + 651159f
commit f4bec21
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gtsam/discrete/discrete.i b/gtsam/discrete/discrete.i
@@ -280,11 +280,11 @@ class DiscreteLookupDAG {
 };
 
 #include <gtsam/discrete/DiscreteFactorGraph.h>
-std::pair<gtsam::DiscreteConditional*, gtsam::DecisionTreeFactor*>
+pair<gtsam::DiscreteConditional*, gtsam::DecisionTreeFactor*>
 EliminateDiscrete(const gtsam::DiscreteFactorGraph& factors,
                   const gtsam::Ordering& frontalKeys);
 
-std::pair<gtsam::DiscreteConditional*, gtsam::DecisionTreeFactor*>
+pair<gtsam::DiscreteConditional*, gtsam::DecisionTreeFactor*>
 EliminateForMPE(const gtsam::DiscreteFactorGraph& factors,
                 const gtsam::Ordering& frontalKeys);