From 6fef22f1edc87a407adecc18013498c7677558b9 Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Thu, 8 Nov 2018 16:18:12 -0500
Subject: [PATCH] C++ typedef is all we need?

---
 gtsam/base/FastVector.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gtsam/base/FastVector.h b/gtsam/base/FastVector.h
index 307a75c87..46bc25642 100644
--- a/gtsam/base/FastVector.h
+++ b/gtsam/base/FastVector.h
@@ -19,12 +19,20 @@
 #pragma once
 
 #include <gtsam/base/FastDefaultAllocator.h>
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/vector.hpp>
 #include <vector>
 
 namespace gtsam {
 
+#ifndef GTSAM_USE_OLD_FAST_VECTOR
+
+template <typename T>
+using FastVector = std::vector<T, typename internal::FastDefaultVectorAllocator<T>::type>;
+
+#else
+
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/vector.hpp>
+
 /**
  * FastVector is a thin wrapper around std::vector that uses the boost
  * pool_allocator instead of the default STL allocator.  This is just a
@@ -91,4 +99,6 @@ class FastVector: public std::vector<VALUE,
     ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
   }
 };
+#endif
+
 }  // namespace gtsam