A few minor fixes to allow compiling 'boost-free' gtsam without compiling 'gtsam_unstable'.

CMakeLists.txt

@@ -95,8 +95,6 @@ add_subdirectory(gtsam)
 # Build Tests
 add_subdirectory(tests)
 
-# Build examples
-add_subdirectory(examples)
 
 # Build timing
 add_subdirectory(timing)
@@ -104,6 +102,9 @@ add_subdirectory(timing)
 # Build gtsam_unstable
 if (GTSAM_BUILD_UNSTABLE)
   add_subdirectory(gtsam_unstable)
+  
+  # Build examples (Note: 'examples' require `gtsam_unstable` be built since it links against it.)
+  add_subdirectory(examples)
 endif()
 
 # This is the new wrapper

gtsam/base/Matrix.cpp

@@ -30,6 +30,7 @@
 #include <fstream>
 #include <limits>
 #include <iostream>
+#include <iterator>
 
 using namespace std;
 

gtsam/discrete/DecisionTree-inl.h

@@ -33,6 +33,7 @@
 #include <vector>
 #include <optional>
 #include <cassert>
+#include <iterator>
 
 namespace gtsam {
 

gtsam/hybrid/HybridSmoother.cpp

@@ -27,7 +27,9 @@ namespace gtsam {
 Ordering HybridSmoother::getOrdering(
     const HybridGaussianFactorGraph &newFactors) {
   HybridGaussianFactorGraph factors(hybridBayesNet());
-  factors += newFactors;
+  for(auto& factor: newFactors){
+    factors.push_back(factor);
+  }
   // Get all the discrete keys from the factors
   KeySet allDiscrete = factors.discreteKeySet();