From fe1daec086aa5b20966d4ab9615be137e665adc9 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Sun, 30 Dec 2018 16:24:19 -0500
Subject: [PATCH] Changed include error as in
 http://boost.2283326.n4.nabble.com/boost-serialization-Serializing-Dynamically-Loaded-Libraries-quot-Unregistered-Void-Cast-quot-td2570981.html

---
 gtsam/base/serialization.h               | 2 +-
 wrap/Module.cpp                          | 4 ++--
 wrap/tests/expected/geometry_wrapper.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gtsam/base/serialization.h b/gtsam/base/serialization.h
index ebd893ad1..954d3e86b 100644
--- a/gtsam/base/serialization.h
+++ b/gtsam/base/serialization.h
@@ -24,7 +24,6 @@
 #include <string>
 
 // includes for standard serialization types
-#include <boost/serialization/export.hpp>
 #include <boost/serialization/optional.hpp>
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/serialization/vector.hpp>
@@ -39,6 +38,7 @@
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
+#include <boost/serialization/export.hpp>
 
 namespace gtsam {
 
diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index 9eee686cb..5cf3b5d6c 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -273,9 +273,9 @@ void Module::generate_matlab_wrapper(const string& toolboxPath) const {
 
   // Include boost.serialization archive headers before other class headers
   if (hasSerialiable) {
-    wrapperFile.oss << "#include <boost/serialization/export.hpp>\n";
     wrapperFile.oss << "#include <boost/archive/text_iarchive.hpp>\n";
-    wrapperFile.oss << "#include <boost/archive/text_oarchive.hpp>\n\n";
+    wrapperFile.oss << "#include <boost/archive/text_oarchive.hpp>\n";
+    wrapperFile.oss << "#include <boost/serialization/export.hpp>\n\n";
   }
 
   // Generate includes while avoiding redundant includes
diff --git a/wrap/tests/expected/geometry_wrapper.cpp b/wrap/tests/expected/geometry_wrapper.cpp
index 7e0cb0e47..dec78b80c 100644
--- a/wrap/tests/expected/geometry_wrapper.cpp
+++ b/wrap/tests/expected/geometry_wrapper.cpp
@@ -1,9 +1,9 @@
 #include <wrap/matlab.h>
 #include <map>
 
-#include <boost/serialization/export.hpp>
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
+#include <boost/serialization/export.hpp>
 
 #include <folder/path/to/Test.h>
 #include <gtsam/geometry/Point2.h>