From d86782eebcf730b743539b692f6ede96b1e8f856 Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Thu, 8 Nov 2018 12:25:21 -0500
Subject: [PATCH] Some remaining std::vector stragglers

---
 examples/SolverComparer.cpp   | 6 +++---
 tests/testGaussianISAM2.cpp   | 2 +-
 tests/testNonlinearFactor.cpp | 2 +-
 timing/timeIncremental.cpp    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/SolverComparer.cpp b/examples/SolverComparer.cpp
index b63e5faeb..f3915ce22 100644
--- a/examples/SolverComparer.cpp
+++ b/examples/SolverComparer.cpp
@@ -429,7 +429,7 @@ void runIncremental()
   //    for (Key key12: boost::adaptors::reverse(values.keys())) {
   //      if(i != j) {
   //        gttic_(jointMarginalInformation);
-  //        std::vector<Key> keys(2);
+  //        KeyVector keys(2);
   //        keys[0] = key1;
   //        keys[1] = key2;
   //        JointMarginal info = marginals.jointMarginalInformation(keys);
@@ -524,7 +524,7 @@ void runCompare()
 
   // Check solution for equality
   cout << "Comparing solutions..." << endl;
-  vector<Key> missingKeys;
+  KeyVector missingKeys;
   br::set_symmetric_difference(soln1.keys(), soln2.keys(), std::back_inserter(missingKeys));
   if(!missingKeys.empty()) {
     cout << "  Keys unique to one solution file: ";
@@ -535,7 +535,7 @@ void runCompare()
     }
     cout << endl;
   }
-  vector<Key> commonKeys;
+  KeyVector commonKeys;
   br::set_intersection(soln1.keys(), soln2.keys(), std::back_inserter(commonKeys));
   double maxDiff = 0.0;
   for(Key j: commonKeys)
diff --git a/tests/testGaussianISAM2.cpp b/tests/testGaussianISAM2.cpp
index d6ca896dd..2b6809ada 100644
--- a/tests/testGaussianISAM2.cpp
+++ b/tests/testGaussianISAM2.cpp
@@ -648,7 +648,7 @@ TEST(ISAM2, slamlike_solution_partial_relinearization_check)
 namespace {
   bool checkMarginalizeLeaves(ISAM2& isam, const FastList<Key>& leafKeys) {
     Matrix expectedAugmentedHessian, expected3AugmentedHessian;
-    vector<Key> toKeep;
+    KeyVector toKeep;
     for(Key j: isam.getDelta() | br::map_keys)
       if(find(leafKeys.begin(), leafKeys.end(), j) == leafKeys.end())
         toKeep.push_back(j);
diff --git a/tests/testNonlinearFactor.cpp b/tests/testNonlinearFactor.cpp
index fb85c3742..2240539f4 100644
--- a/tests/testNonlinearFactor.cpp
+++ b/tests/testNonlinearFactor.cpp
@@ -401,7 +401,7 @@ TEST( NonlinearFactor, clone_rekey )
   EXPECT(assert_equal(*init, *actClone));
 
   // Re-key factor - clones with different keys
-  std::vector<Key> new_keys(4);
+  KeyVector new_keys(4);
   new_keys[0] = X(5);
   new_keys[1] = X(6);
   new_keys[2] = X(7);
diff --git a/timing/timeIncremental.cpp b/timing/timeIncremental.cpp
index 61e129699..8f5be86d6 100644
--- a/timing/timeIncremental.cpp
+++ b/timing/timeIncremental.cpp
@@ -231,7 +231,7 @@ int main(int argc, char *argv[]) {
       for (Key key2: boost::adaptors::reverse(values.keys())) {
         if(i != j) {
           gttic_(jointMarginalInformation);
-          std::vector<Key> keys(2);
+          KeyVector keys(2);
           keys[0] = key1;
           keys[1] = key2;
           JointMarginal info = marginals.jointMarginalInformation(keys);