procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/51142 ([C++0x] map::erase(key) doesn't compile with -D_GLIBCXX_DEBUG.)

Browse source 
2011-11-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/51142
	* include/debug/unordered_map (unordered_map<>::erase(iterator),
	unordered_multimap<>::erase(iterator)): Add, consistently with
	LWG 2059.
	* include/debug/unordered_set (unordered_set<>::erase(iterator),
	unordered_multiset<>::erase(iterator)): Likewise.
	* include/debug/map.h (map<>::erase(iterator)): Likewise.
	* include/debug/multimap.h (multimap<>::erase(iterator)): Likewise.
	* include/profile/map.h (map<>::erase(iterator)): Likewise.
	* include/profile/multimap.h (multimap<>::erase(iterator)): Likewise.
	* include/bits/hashtable.h (_Hashtable<>::erase(iterator)): Likewise.
	* include/bits/stl_map.h (map<>::erase(iterator)): Likewise.
	* include/bits/stl_multimap.h (multimap<>::erase(iterator)): Likewise.
	* include/bits/stl_tree.h (_Rb_tree<>::erase(iterator)): Likewise.
	* testsuite/23_containers/unordered_map/erase/51142.cc: New.
	* testsuite/23_containers/multimap/modifiers/erase/51142.cc: Likewise.
	* testsuite/23_containers/set/modifiers/erase/51142.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/erase/51142.cc: Likewise.
	* testsuite/23_containers/unordered_set/erase/51142.cc: Likewise.
	* testsuite/23_containers/multiset/modifiers/erase/51142.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/erase/51142.cc: Likewise.
	* testsuite/23_containers/map/modifiers/erase/51142.cc: Likewise.

From-SVN: r181394
This commit is contained in:
Paolo Carlini 2011-11-15 23:28:49 +00:00 • committed by Paolo Carlini
parent f01fe5f68a
commit 6dc88283f6
19 changed files with 386 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,28 @@
2011-11-15 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/51142
* include/debug/unordered_map (unordered_map<>::erase(iterator),
unordered_multimap<>::erase(iterator)): Add, consistently with
LWG 2059.
* include/debug/unordered_set (unordered_set<>::erase(iterator),
unordered_multiset<>::erase(iterator)): Likewise.
* include/debug/map.h (map<>::erase(iterator)): Likewise.
* include/debug/multimap.h (multimap<>::erase(iterator)): Likewise.
* include/profile/map.h (map<>::erase(iterator)): Likewise.
* include/profile/multimap.h (multimap<>::erase(iterator)): Likewise.
* include/bits/hashtable.h (_Hashtable<>::erase(iterator)): Likewise.
* include/bits/stl_map.h (map<>::erase(iterator)): Likewise.
* include/bits/stl_multimap.h (multimap<>::erase(iterator)): Likewise.
* include/bits/stl_tree.h (_Rb_tree<>::erase(iterator)): Likewise.
* testsuite/23_containers/unordered_map/erase/51142.cc: New.
* testsuite/23_containers/multimap/modifiers/erase/51142.cc: Likewise.
* testsuite/23_containers/set/modifiers/erase/51142.cc: Likewise.
* testsuite/23_containers/unordered_multimap/erase/51142.cc: Likewise.
* testsuite/23_containers/unordered_set/erase/51142.cc: Likewise.
* testsuite/23_containers/multiset/modifiers/erase/51142.cc: Likewise.
* testsuite/23_containers/unordered_multiset/erase/51142.cc: Likewise.
* testsuite/23_containers/map/modifiers/erase/51142.cc: Likewise.
2011-11-15 Jason Dick <dickphd@gmail.com>
PR libstdc++/51133

5
libstdc++-v3/include/bits/hashtable.h
View file

@ -432,6 +432,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
iterator
erase(const_iterator);
// LWG 2059.
iterator
erase(iterator __it)
{ return erase(const_iterator(__it)); }
size_type
erase(const key_type&);

5
libstdc++-v3/include/bits/stl_map.h
View file

@ -617,6 +617,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
iterator
erase(const_iterator __position)
{ return _M_t.erase(__position); }
// LWG 2059.
iterator
erase(iterator __position)
{ return _M_t.erase(__position); }
#else
/**
* @brief Erases an element from a %map.

5
libstdc++-v3/include/bits/stl_multimap.h
View file

@ -536,6 +536,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
iterator
erase(const_iterator __position)
{ return _M_t.erase(__position); }
// LWG 2059.
iterator
erase(iterator __position)
{ return _M_t.erase(__position); }
#else
/**
* @brief Erases an element from a %multimap.

10
libstdc++-v3/include/bits/stl_tree.h
View file

@ -767,6 +767,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_erase_aux(__position);
return __result._M_const_cast();
}
// LWG 2059.
iterator
erase(iterator __position)
{
iterator __result = __position;
++__result;
_M_erase_aux(__position);
return __result;
}
#else
void
erase(iterator __position)

4
libstdc++-v3/include/debug/map.h
View file

@ -271,6 +271,10 @@ namespace __debug
this->_M_invalidate_if(_Equal(__position.base()));
return iterator(_Base::erase(__position.base()), this);
}
iterator
erase(iterator __position)
{ return erase(const_iterator(__position)); }
#else
void
erase(iterator __position)

4
libstdc++-v3/include/debug/multimap.h
View file

@ -254,6 +254,10 @@ namespace __debug
this->_M_invalidate_if(_Equal(__position.base()));
return iterator(_Base::erase(__position.base()), this);
}
iterator
erase(iterator __position)
{ return erase(const_iterator(__position)); }
#else
void
erase(iterator __position)

8
libstdc++-v3/include/debug/unordered_map
View file

@ -333,6 +333,10 @@ namespace __debug
return iterator(__next, this);
}
iterator
erase(iterator __it)
{ return erase(const_iterator(__it)); }
iterator
erase(const_iterator __first, const_iterator __last)
{
@ -708,6 +712,10 @@ namespace __debug
return iterator(__next, this);
}
iterator
erase(iterator __it)
{ return erase(const_iterator(__it)); }
iterator
erase(const_iterator __first, const_iterator __last)
{

8
libstdc++-v3/include/debug/unordered_set
View file

@ -329,6 +329,10 @@ namespace __debug
return iterator(__next, this);
}
iterator
erase(iterator __it)
{ return erase(const_iterator(__it)); }
iterator
erase(const_iterator __first, const_iterator __last)
{
@ -695,6 +699,10 @@ namespace __debug
return iterator(_Base::erase(__it.base()), this);
}
iterator
erase(iterator __it)
{ return erase(const_iterator(__it)); }
iterator
erase(const_iterator __first, const_iterator __last)
{

4
libstdc++-v3/include/profile/map.h
View file

@ -327,6 +327,10 @@ namespace __profile
__profcxx_map_to_unordered_map_erase(this, size(), 1);
return __i;
}
iterator
erase(iterator __position)
{ return erase(const_iterator(__position)); }
#else
void
erase(iterator __position)

4
libstdc++-v3/include/profile/multimap.h
View file

@ -226,6 +226,10 @@ namespace __profile
iterator
erase(const_iterator __position)
{ return iterator(_Base::erase(__position)); }
iterator
erase(iterator __position)
{ return iterator(_Base::erase(__position)); }
#else
void
erase(iterator __position)

38
libstdc++-v3/testsuite/23_containers/map/modifiers/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <map>
struct X
{
template<typename T>
X(T&) {}
};
bool operator<(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::map<X, int>& s, X x)
{
std::map<X, int>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/multimap/modifiers/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <map>
struct X
{
template<typename T>
X(T&) {}
};
bool operator<(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::multimap<X, int>& s, X x)
{
std::multimap<X, int>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/multiset/modifiers/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <set>
struct X
{
template<typename T>
X(T&) {}
};
bool operator<(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::multiset<X>& s, X x)
{
std::multiset<X>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/set/modifiers/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <set>
struct X
{
template<typename T>
X(T&) {}
};
bool operator<(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::set<X>& s, X x)
{
std::set<X>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/unordered_map/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <unordered_map>
struct X
{
template<typename T>
X(T&) {}
};
bool operator==(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::unordered_map<X, int>& s, X x)
{
std::unordered_map<X, int>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <unordered_map>
struct X
{
template<typename T>
X(T&) {}
};
bool operator==(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::unordered_multimap<X, int>& s, X x)
{
std::unordered_multimap<X, int>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <unordered_set>
struct X
{
template<typename T>
X(T&) {}
};
bool operator==(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::unordered_multiset<X>& s, X x)
{
std::unordered_multiset<X>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}

38
libstdc++-v3/testsuite/23_containers/unordered_set/erase/51142.cc Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2011 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 of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
#include <unordered_set>
struct X
{
template<typename T>
X(T&) {}
};
bool operator==(const X&, const X&) { return false; }
// LWG 2059.
void erasor(std::unordered_set<X>& s, X x)
{
std::unordered_set<X>::iterator it = s.find(x);
if (it != s.end())
s.erase(it);
}