From 895da61f05598550d4797cd2d6a07f4a79119a02 Mon Sep 17 00:00:00 2001
From: cbeall <cbeall@nuro.ai>
Date: Thu, 8 Nov 2018 16:18:51 -0800
Subject: [PATCH] Fix remaining FastVector errors for gcc + tbb + Ubuntu in
 tests

---
 gtsam/base/tests/testTreeTraversal.cpp                |  4 ++--
 .../tests/testConcurrentIncrementalFilter.cpp         | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gtsam/base/tests/testTreeTraversal.cpp b/gtsam/base/tests/testTreeTraversal.cpp
index 8fe5e53ef..88e476cb9 100644
--- a/gtsam/base/tests/testTreeTraversal.cpp
+++ b/gtsam/base/tests/testTreeTraversal.cpp
@@ -40,8 +40,8 @@ struct TestNode {
 struct TestForest {
   typedef TestNode Node;
   typedef Node::shared_ptr sharedNode;
-  vector<sharedNode> roots_;
-  const vector<sharedNode>& roots() const { return roots_; }
+  FastVector<sharedNode> roots_;
+  const FastVector<sharedNode>& roots() const { return roots_; }
 };
 
 TestForest makeTestForest() {
diff --git a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp
index 97b79394f..d6f6446e8 100644
--- a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp
+++ b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp
@@ -1110,12 +1110,13 @@ TEST( ConcurrentIncrementalFilter, CalculateMarginals_1 )
   // Create the set of marginalizable variables
   GaussianFactorGraph linearGraph = *factorGraph.linearize(newValues);
 
-    GaussianFactorGraph marginal = *linearGraph.eliminatePartialMultifrontal({1}, EliminateCholesky).second;
+  KeyVector linearIndices {1};
+  GaussianFactorGraph marginal = *linearGraph.eliminatePartialMultifrontal(linearIndices, EliminateCholesky).second;
 
-    NonlinearFactorGraph expectedMarginals;
-    for(const GaussianFactor::shared_ptr& factor: marginal) {
-      expectedMarginals.push_back(LinearContainerFactor(factor, newValues));
-    }
+  NonlinearFactorGraph expectedMarginals;
+  for(const GaussianFactor::shared_ptr& factor: marginal) {
+    expectedMarginals.push_back(LinearContainerFactor(factor, newValues));
+  }
 
   FastList<Key> keysToMarginalize;
   keysToMarginalize.push_back(1);