Merge from trunk

[SVN r80689]
This commit is contained in:
Ion Gaztañaga committed 2012-09-24 12:17:34 +00:00
1 parent d535f151e7
commit 0519b950f4
40 files changed
+4963 -4220

No files matched your search

+2 -2
View File
@@ -118,7 +118,7 @@ class set
template <class InputIterator>
set(InputIterator first, InputIterator last, const Pred& comp = Pred(),
const allocator_type& a = allocator_type())
: m_tree(first, last, comp, a, true)
: m_tree(true, first, last, comp, a)
{}
//! <b>Effects</b>: Constructs an empty set using the specified comparison object and
@@ -705,7 +705,7 @@ class multiset
multiset(InputIterator first, InputIterator last,
const Pred& comp = Pred(),
const allocator_type& a = allocator_type())
: m_tree(first, last, comp, a, false)
: m_tree(false, first, last, comp, a)
{}
//! <b>Effects</b>: Constructs an empty multiset using the specified comparison object and