Removed old FastVector code.

gtsam/base/FastVector.h

@@ -11,8 +11,9 @@
 
 /**
  * @file    FastVector.h
- * @brief   A thin wrapper around std::vector that uses boost's pool_allocator.
+ * @brief   A thin wrapper around std::vector that uses a custom allocator.
  * @author  Richard Roberts
+ * @author  Frank Dellaert
  * @date    Feb 9, 2011
  */
 
@@ -23,82 +24,13 @@
 
 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
+ * FastVector is a type alias to a std::vector with a custom memory allocator.
- * pool_allocator instead of the default STL allocator.  This is just a
+ * The particular allocator depends on GTSAM's cmake configuration.
- * convenience to avoid having lengthy types in the code.  Through timing,
- * we've seen that the pool_allocator can lead to speedups of several %
  * @addtogroup base
  */
-template<typename VALUE>
+template <typename T>
-class FastVector: public std::vector<VALUE,
+using FastVector =
-    typename internal::FastDefaultVectorAllocator<VALUE>::type> {
+    std::vector<T, typename internal::FastDefaultVectorAllocator<T>::type>;
- public:
-  typedef std::vector<VALUE,
-      typename internal::FastDefaultVectorAllocator<VALUE>::type> Base;
-
-  /** Default constructor */
-  FastVector() {
-  }
-
-  /** Constructor from size */
-  explicit FastVector(size_t size) :
-      Base(size) {
-  }
-
-  /** Constructor from size and initial values */
-  explicit FastVector(size_t size, const VALUE& initial) :
-      Base(size, initial) {
-  }
-
-  /** Constructor from a range, passes through to base class */
-  template<typename INPUTITERATOR>
-  explicit FastVector(INPUTITERATOR first, INPUTITERATOR last) {
-    // This if statement works around a bug in boost pool allocator and/or
-    // STL vector where if the size is zero, the pool allocator will allocate
-    // huge amounts of memory.
-    if (first != last)
-      Base::assign(first, last);
-  }
-
-  /** Copy constructor from the base class */
-  FastVector(const Base& x) :
-      Base(x) {
-  }
-
-  /** Copy constructor from a standard STL container */
-  template<typename ALLOCATOR>
-  FastVector(const std::vector<VALUE, ALLOCATOR>& x) {
-    // This if statement works around a bug in boost pool allocator and/or
-    // STL vector where if the size is zero, the pool allocator will allocate
-    // huge amounts of memory.
-    if (x.size() > 0)
-      Base::assign(x.begin(), x.end());
-  }
-
-  /** Conversion to a standard STL container */
-  operator std::vector<VALUE>() const {
-    return std::vector<VALUE>(this->begin(), this->end());
-  }
-
- private:
-  /** Serialization function */
-  friend class boost::serialization::access;
-  template<class ARCHIVE>
-  void serialize(ARCHIVE & ar, const unsigned int /*version*/) {
-    ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
-  }
-};
-#endif
 
 }  // namespace gtsam