[Debtags-commits] [svn] r1822 - in tagcoll/2.0: . tagcoll/coll tagcoll/tests

[Enrico Zini]

Author: enrico
Date: Sun Jul  9 07:51:51 2006
New Revision: 1822

Modified:
   tagcoll/2.0/   (props changed)
   tagcoll/2.0/tagcoll/coll/base.tcc
   tagcoll/2.0/tagcoll/coll/intdiskindex.cc
   tagcoll/2.0/tagcoll/tests/test-utils.tcc
Log:
 r3009 at viaza:  enrico | 2006-07-08 23:36:36 +0200
 All tests pass


Modified: tagcoll/2.0/tagcoll/coll/base.tcc
==============================================================================
--- tagcoll/2.0/tagcoll/coll/base.tcc	(original)
+++ tagcoll/2.0/tagcoll/coll/base.tcc	Sun Jul  9 07:51:51 2006
@@ -71,7 +71,8 @@
 {
 	std::set<typename coll_traits<Self>::tag_type> asSet = self().getAllTags();
 	std::vector<typename coll_traits<Self>::tag_type> res;
-	std::copy(asSet.begin(), asSet.end(), res.begin());
+	res.reserve(asSet.size());
+	std::copy(asSet.begin(), asSet.end(), back_inserter(res));
 	return res;
 }
 

Modified: tagcoll/2.0/tagcoll/coll/intdiskindex.cc
==============================================================================
--- tagcoll/2.0/tagcoll/coll/intdiskindex.cc	(original)
+++ tagcoll/2.0/tagcoll/coll/intdiskindex.cc	Sun Jul  9 07:51:51 2006
@@ -355,7 +355,8 @@
 
 std::vector<int> IntDiskIndex::getAllTagsAsVector() const
 {
-	std::vector<int> res(tagidx.size());
+	std::vector<int> res;
+	res.reserve(tagidx.size());
 	for (size_t i = 0; i < tagidx.size(); ++i)
 		res[i] = i;
 	return res;

Modified: tagcoll/2.0/tagcoll/tests/test-utils.tcc
==============================================================================
--- tagcoll/2.0/tagcoll/tests/test-utils.tcc	(original)
+++ tagcoll/2.0/tagcoll/tests/test-utils.tcc	Sun Jul  9 07:51:51 2006
@@ -308,8 +308,8 @@
 
 	std::vector<string> tags = tc.tagsInDiscriminanceOrder();
 	inner_ensure_equals(tags.size(), 5u);
-	inner_ensure(tags[5] != "rosemerry");
-	inner_ensure(tags[5] != "mushrooms");
+	inner_ensure(tags[4] != "rosemerry");
+	inner_ensure(tags[4] != "mushrooms");
 	inner_ensure(tags[0] != "tomato");
 	inner_ensure(tags[0] != "mozzarella");
 	inner_ensure(tags[0] != "garlic");
@@ -327,9 +327,9 @@
 
 	tags = tc.tagsInRelevanceOrder(coll1);
 	inner_ensure_equals(tags.size(), 5u);
-	inner_ensure(tags[5] != "rosemerry");
-	inner_ensure(tags[5] != "garlic");
-	inner_ensure(tags[5] != "mushrooms");
+	inner_ensure(tags[4] != "rosemerry");
+	inner_ensure(tags[4] != "garlic");
+	inner_ensure(tags[4] != "mushrooms");
 	inner_ensure(tags[0] != "tomato");
 	inner_ensure(tags[0] != "mozzarella");
 }