diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-01-03 20:30:28 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-01-03 20:30:28 +0000 |
| commit | 5ab06c6dfee6999f0ebd2d77f53766de18e5dc5f (patch) | |
| tree | 245c4584a0dd9666c492348854833672db104618 /libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp | |
| parent | c9828e7878e2bb5491e8d4b6504f9050b1afb708 (diff) | |
| download | gcc-5ab06c6dfee6999f0ebd2d77f53766de18e5dc5f.tar.gz | |
set.h: Implement DR 130 here too.
2010-01-03 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/set.h: Implement DR 130 here too.
* include/debug/multiset.h: Likewise.
* include/debug/map.h: Likewise.
* include/debug/multimap.h: Likewise.
* include/profile/set.h: Implement DR 130 fully.
* include/profile/multiset.h: Likewise.
* include/profile/map.h: Likewise.
* include/profile/multimap.h: Likewise.
* include/debug/list: Implement DR 1133 here too.
* include/ext/pb_ds/detail/debug_map_base.hpp: Comment out for
now uses of __gnu_cxx::throw_allocator.
* testsuite/21_strings/basic_string/40160.cc: Don't pass
explicitly -D_GLIBCXX_DEBUG, doesn't play well with profile-mode
testing.
From-SVN: r155594
Diffstat (limited to 'libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp')
| -rw-r--r-- | libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp index 2227691feb0..ebe8dc8416f 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp @@ -1,6 +1,7 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -153,9 +154,10 @@ namespace __gnu_pbds insert_new(const_key_reference r_key) { _GLIBCXX_DEBUG_ONLY(assert_valid();) - __gnu_cxx::throw_allocator<char> alloc; - const double orig_throw_prob = alloc.get_probability(); - alloc.set_probability(0); + // XXX FIXME: Adapt for __gnu_cxx::throw_allocator_random. + //__gnu_cxx::throw_allocator<char> alloc; + // const double orig_throw_prob = alloc.get_probability(); + // alloc.set_probability(0); if (find(r_key) != m_key_set.end()) { std::cerr << "insert_new" << r_key << std::endl; @@ -171,7 +173,7 @@ namespace __gnu_pbds std::cerr << "insert_new" << r_key << std::endl; std::abort(); } - alloc.set_probability(orig_throw_prob); + // alloc.set_probability(orig_throw_prob); _GLIBCXX_DEBUG_ONLY(assert_valid();) } @@ -314,9 +316,10 @@ namespace __gnu_pbds PB_DS_CLASS_C_DEC:: split(const_key_reference r_key, Cmp_Fn cmp_fn, PB_DS_CLASS_C_DEC& other) { - __gnu_cxx::throw_allocator<char> alloc; - const double orig_throw_prob = alloc.get_probability(); - alloc.set_probability(0); + // XXX FIXME: Adapt for __gnu_cxx::throw_allocator_random. + // __gnu_cxx::throw_allocator<char> alloc; + // const double orig_throw_prob = alloc.get_probability(); + // alloc.set_probability(0); other.clear(); key_set_iterator it = m_key_set.begin(); while (it != m_key_set.end()) @@ -327,7 +330,7 @@ namespace __gnu_pbds } else ++it; - alloc.set_probability(orig_throw_prob); + // alloc.set_probability(orig_throw_prob); } PB_DS_CLASS_T_DEC @@ -335,9 +338,10 @@ namespace __gnu_pbds PB_DS_CLASS_C_DEC:: join(PB_DS_CLASS_C_DEC& other) { - __gnu_cxx::throw_allocator<char> alloc; - const double orig_throw_prob = alloc.get_probability(); - alloc.set_probability(0); + // XXX FIXME: Adapt for __gnu_cxx::throw_allocator_random. + // __gnu_cxx::throw_allocator<char> alloc; + // const double orig_throw_prob = alloc.get_probability(); + // alloc.set_probability(0); key_set_iterator it = other.m_key_set.begin(); while (it != other.m_key_set.end()) { @@ -345,7 +349,7 @@ namespace __gnu_pbds it = other.m_key_set.erase(it); } _GLIBCXX_DEBUG_ASSERT(other.m_key_set.empty()); - alloc.set_probability(orig_throw_prob); + // alloc.set_probability(orig_throw_prob); } #undef PB_DS_CLASS_T_DEC |