From fa7f116a662bf8cff80402ad0011bcb83296c182 Mon Sep 17 00:00:00 2001
From: anmoreau <anmoreau@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Mon, 24 Aug 2015 14:56:23 +0000
Subject: Fixes

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/copy_move@757 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 88bfc9b672be26ed97bea4aecdcfbafb24259553
---
 src/Simplex_tree/include/gudhi/Simplex_tree.h                       | 2 +-
 src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index b32b525b..51c39801 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -288,7 +288,7 @@ class Simplex_tree {
   /** \brief Copy; copy the whole tree structure. */
   Simplex_tree(Simplex_tree& copy) : 	null_vertex_(copy.null_vertex_),
   										threshold_(copy.threshold_),
-										root_(NULL, -1, std::vector<std::pair<Vertex_handle, Node>> (copy.root_.members().begin(), copy.root_.members().end())),
+										root_(NULL, -1, copy.root_.members()),
 										filtration_vect_(copy.filtration_vect_),
 										dimension_(copy.dimension_) {
 		rec_copy(&root_, &copy.root_);
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h
index de350f2d..b9f8dcc1 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h
@@ -71,15 +71,16 @@ class Simplex_tree_siblings {
   /* \brief Constructor with initialized set of members.
    *
    * 'members' must be sorted and unique.*/
+  template<typename RandomAccessVertexRange>
   Simplex_tree_siblings(Simplex_tree_siblings * oncles, Vertex_handle parent,
-                        const std::vector<std::pair<Vertex_handle, Node> > & members)
+                        RandomAccessVertexRange members)
       : oncles_(oncles),
         parent_(parent),
         members_(boost::container::ordered_unique_range, members.begin(),
                  members.end()) {
     for (auto& map_el : members_) {
       map_el.second.assign_children(this);
-    }
+	}
   }
 
   /*
-- 
cgit v1.2.3