From: Benjamin Kosnik Date: Sat, 26 Apr 2008 02:21:37 +0000 (+0000) Subject: re PR libstdc++/35922 (std::unordered_map missing in debug mode) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a93a597ae7f0feecd9dcf9d19c538e70d48e848d;p=gcc.git re PR libstdc++/35922 (std::unordered_map missing in debug mode) 2008-04-25 Benjamin Kosnik PR libstdc++/35922 * include/std/unordered_map: Include debug/unordered_map if _GLIBCXX_DEBUG. * testsuite/23_containers/unordered_map/requirements/debug.cc: Move... * testsuite/23_containers/unordered_map/requirements/ debug_container.cc: ...here. * testsuite/23_containers/unordered_map/requirements/debug_mode.cc: New. * testsuite/23_containers/unordered_set/requirements/debug.cc: Move... * testsuite/23_containers/unordered_set/requirements/ debug_container.cc: ...here. * testsuite/23_containers/unordered_set/requirements/debug_mode.cc: New. From-SVN: r134693 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 23057295399..ded6f51a2ab 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2008-04-25 Benjamin Kosnik + + PR libstdc++/35922 + * include/std/unordered_map: Include debug/unordered_map if + _GLIBCXX_DEBUG. + * testsuite/23_containers/unordered_map/requirements/debug.cc: Move... + * testsuite/23_containers/unordered_map/requirements/ + debug_container.cc: ...here. + * testsuite/23_containers/unordered_map/requirements/debug_mode.cc: New. + * testsuite/23_containers/unordered_set/requirements/debug.cc: Move... + * testsuite/23_containers/unordered_set/requirements/ + debug_container.cc: ...here. + * testsuite/23_containers/unordered_set/requirements/debug_mode.cc: New. + 2008-04-25 Benjamin Kosnik PR libstdc++/35887 diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map index 5fb714dd48d..73be402e474 100644 --- a/libstdc++-v3/include/std/unordered_map +++ b/libstdc++-v3/include/std/unordered_map @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008 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 @@ -73,4 +73,8 @@ # undef _GLIBCXX_INCLUDE_AS_CXX0X #endif +#ifdef _GLIBCXX_DEBUG +# include +#endif + #endif // _GLIBCXX_UNORDERED_MAP diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug.cc deleted file mode 100644 index a880bdc57a8..00000000000 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug.cc +++ /dev/null @@ -1,39 +0,0 @@ -// { dg-options "-std=gnu++0x" } -// { dg-do compile } - -// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free -// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -// USA. - -#include -#include - -using namespace __gnu_debug; - -using std::allocator; -using std::equal_to; -using std::hash; -using std::pair; -using std::string; - -template class unordered_map; -template class unordered_map, equal_to, - allocator > >; -template class unordered_map, equal_to, - allocator >; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc new file mode 100644 index 00000000000..a880bdc57a8 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc @@ -0,0 +1,39 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include + +using namespace __gnu_debug; + +using std::allocator; +using std::equal_to; +using std::hash; +using std::pair; +using std::string; + +template class unordered_map; +template class unordered_map, equal_to, + allocator > >; +template class unordered_map, equal_to, + allocator >; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_mode.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_mode.cc new file mode 100644 index 00000000000..c2d3ffe88da --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_mode.cc @@ -0,0 +1,38 @@ +// { dg-options "-std=gnu++0x -D_GLIBCXX_DEBUG" } +// { dg-do compile } + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include + +//PR libstdc++/35922 +int main() +{ + std::unordered_map m; +} + diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug.cc deleted file mode 100644 index 2894dff0edb..00000000000 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug.cc +++ /dev/null @@ -1,26 +0,0 @@ -// { dg-options "-std=gnu++0x" } -// { dg-do compile } - -// Copyright (C) 2007 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 2, 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 COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02110-1301, USA. - -#include - -using namespace __gnu_debug; - -template class unordered_set; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug_container.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug_container.cc new file mode 100644 index 00000000000..2894dff0edb --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug_container.cc @@ -0,0 +1,26 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02110-1301, USA. + +#include + +using namespace __gnu_debug; + +template class unordered_set; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug_mode.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug_mode.cc new file mode 100644 index 00000000000..463e6a361f0 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/debug_mode.cc @@ -0,0 +1,38 @@ +// { dg-options "-std=gnu++0x -D_GLIBCXX_DEBUG" } +// { dg-do compile } + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include + +//PR libstdc++/35922 +int main() +{ + std::unordered_set s; +} +