Merge changes for 1.54

[SVN r84342]
This commit is contained in:
Ion Gaztañaga
2013-05-18 10:52:46 +00:00
parent a479114dc9
commit f74eb7fab0
33 changed files with 78 additions and 582 deletions
+1 -2
View File
@@ -71,8 +71,7 @@ int main()
base_set.insert(*it);
//Now insert values's and values2's elements in the unordered_multiset
for(VectIt it(values.begin()), itend(values.end()),
it2(values2.begin()),itend2(values2.end())
for(VectIt it(values.begin()), itend(values.end()), it2(values2.begin())
; it != itend; ++it, ++it2){
member_multi_set.insert(*it);
member_multi_set.insert(*it2);