2 files changed, 7 insertions, 5 deletions
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
index 87981c25..7b169784 100644
--- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
@@ -38,8 +38,9 @@ public:
   typedef Active_witness<Id_distance_pair, INS_range> ActiveWitness;
   typedef typename INS_range::iterator INS_iterator;
   typedef Active_witness_iterator< ActiveWitness, Id_distance_pair, INS_iterator > iterator;
+  typedef typename std::list<Id_distance_pair> Table;
   
-  std::vector<Id_distance_pair> nearest_landmark_table_;
+  Table nearest_landmark_table_;
   INS_range    search_range_;
   INS_iterator iterator_last_;
   INS_iterator iterator_end_;
@@ -60,8 +61,8 @@ public:
     return iterator(this);
   }
 
-  std::vector<Id_distance_pair> end_element_table_;
-  typename std::vector<Id_distance_pair>::iterator end_pointer = end_element_table_.end();
+  Table end_element_table_ = {Id_distance_pair(-1,0)};
+  typename Table::iterator end_pointer = end_element_table_.begin();
 };
 
 }
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
index cd4f4b92..658405f6 100644
--- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
@@ -42,7 +42,7 @@ class Active_witness_iterator
   friend class boost::iterator_core_access;
   
   //typedef Active_witness<Id_distance_pair, INS_iterator> Active_witness;
-  typedef typename std::vector<Id_distance_pair>::iterator Pair_iterator;
+  typedef typename std::list<Id_distance_pair>::iterator Pair_iterator;
   typedef typename Gudhi::witness_complex::Active_witness_iterator<Active_witness, Id_distance_pair, INS_iterator> Iterator;
   
   
@@ -57,7 +57,8 @@ public:
   {
   }
 
-  Active_witness_iterator(Active_witness* aw, Pair_iterator lh_)
+  Active_witness_iterator(Active_witness* aw, Pair_iterator lh)
+    : aw_(aw), lh_(lh)
   {
   }