From 039250983c55b19501575d536bc74586a0fc7410 Mon Sep 17 00:00:00 2001
From: Aleksei Evlampev <a.evlampev@innopolis.ru>
Date: Tue, 6 Apr 2021 14:33:55 +0300
Subject: [PATCH 1/3] fix boost serialization version includes

---
 gtsam/base/FastList.h          | 2 ++
 gtsam/linear/LossFunctions.h   | 2 +-
 gtsam/linear/SubgraphBuilder.h | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gtsam/base/FastList.h b/gtsam/base/FastList.h
index 380836d1d..752b0b571 100644
--- a/gtsam/base/FastList.h
+++ b/gtsam/base/FastList.h
@@ -22,6 +22,8 @@
 #include <list>
 #include <boost/utility/enable_if.hpp>
 #include <boost/serialization/nvp.hpp>
+#include <boost/serialization/version.hpp>
+#include <boost/serialization/optional.hpp>
 #include <boost/serialization/list.hpp>
 
 namespace gtsam {
diff --git a/gtsam/linear/LossFunctions.h b/gtsam/linear/LossFunctions.h
index 4e6a2b609..c3d7d64db 100644
--- a/gtsam/linear/LossFunctions.h
+++ b/gtsam/linear/LossFunctions.h
@@ -25,10 +25,10 @@
 
 #include <boost/serialization/extended_type_info.hpp>
 #include <boost/serialization/nvp.hpp>
+#include <boost/serialization/version.hpp>
 #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 88c771ba5..21b8d8690 100644
--- a/gtsam/linear/SubgraphBuilder.h
+++ b/gtsam/linear/SubgraphBuilder.h
@@ -22,8 +22,9 @@
 #include <gtsam/dllexport.h>
 
 #include <boost/serialization/nvp.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/serialization/version.hpp>
+#include <boost/serialization/optional.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <vector>
 

From 16852849bd0c09963a7bf84fd787080798cc4717 Mon Sep 17 00:00:00 2001
From: Aleksei Evlampev <a.evlampev@innopolis.ru>
Date: Wed, 7 Apr 2021 13:15:12 +0300
Subject: [PATCH 2/3] remove unnecessary includes in SubgraphBuilder.h

---
 gtsam/linear/SubgraphBuilder.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gtsam/linear/SubgraphBuilder.h b/gtsam/linear/SubgraphBuilder.h
index 21b8d8690..5247ea2a2 100644
--- a/gtsam/linear/SubgraphBuilder.h
+++ b/gtsam/linear/SubgraphBuilder.h
@@ -22,8 +22,6 @@
 #include <gtsam/dllexport.h>
 
 #include <boost/serialization/nvp.hpp>
-#include <boost/serialization/version.hpp>
-#include <boost/serialization/optional.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <vector>

From 6cef675e6eaeaf89f2462e8cfec4a4a9a497fac8 Mon Sep 17 00:00:00 2001
From: Aleksei Evlampev <a.evlampev@innopolis.ru>
Date: Thu, 8 Apr 2021 14:54:52 +0300
Subject: [PATCH 3/3] return back including boost version.hpp header

---
 gtsam/linear/SubgraphBuilder.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtsam/linear/SubgraphBuilder.h b/gtsam/linear/SubgraphBuilder.h
index 5247ea2a2..84a477a5e 100644
--- a/gtsam/linear/SubgraphBuilder.h
+++ b/gtsam/linear/SubgraphBuilder.h
@@ -21,6 +21,7 @@
 #include <gtsam/base/types.h>
 #include <gtsam/dllexport.h>
 
+#include <boost/serialization/version.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/shared_ptr.hpp>