From cfc77b7df8b97a7eea7c342a56c48193e240719f Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Thu, 11 Mar 2021 18:24:34 -0500
Subject: [PATCH 1/2] fixed inhertance

---
 gtsam/gtsam.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtsam/gtsam.i b/gtsam/gtsam.i
index 85209ddfa8..273a5e059f 100644
--- a/gtsam/gtsam.i
+++ b/gtsam/gtsam.i
@@ -1809,7 +1809,7 @@ class GaussianFactorGraph {
 };
 
 #include <gtsam/linear/GaussianConditional.h>
-virtual class GaussianConditional : gtsam::GaussianFactor {
+virtual class GaussianConditional : gtsam::JacobianFactor {
   //Constructors
   GaussianConditional(size_t key, Vector d, Matrix R, const gtsam::noiseModel::Diagonal* sigmas);
   GaussianConditional(size_t key, Vector d, Matrix R, size_t name1, Matrix S,

From c37c8b794ed9dfed4d4ff1ab6299100312402a20 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Thu, 11 Mar 2021 18:26:22 -0500
Subject: [PATCH 2/2] Added explicit header as suggested in issue #634

---
 gtsam/linear/LossFunctions.h   | 1 +
 gtsam/linear/SubgraphBuilder.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gtsam/linear/LossFunctions.h b/gtsam/linear/LossFunctions.h
index 4705721a07..4e6a2b609c 100644
--- a/gtsam/linear/LossFunctions.h
+++ b/gtsam/linear/LossFunctions.h
@@ -28,6 +28,7 @@
 #include <boost/serialization/optional.hpp>
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/serialization/singleton.hpp>
+#include <boost/serialization/version.hpp>
 
 namespace gtsam {
 namespace noiseModel {
diff --git a/gtsam/linear/SubgraphBuilder.h b/gtsam/linear/SubgraphBuilder.h
index 5247ea2a28..88c771ba5f 100644
--- a/gtsam/linear/SubgraphBuilder.h
+++ b/gtsam/linear/SubgraphBuilder.h
@@ -23,6 +23,7 @@
 
 #include <boost/serialization/nvp.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/serialization/version.hpp>
 
 #include <vector>