From f07beda95a1c3de83d8d453116e1585ce27bdd3e Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 18 Mar 2002 10:47:15 +0000 Subject: [PATCH] hash_map.h: hash, hashtable, hash_map and hash_multimap are in namespace __gnu_cxx. 2002-03-15 Philipp Thomas * include/backward/hash_map.h: hash, hashtable, hash_map and hash_multimap are in namespace __gnu_cxx. include/backward/hash_set.h: hash, hashtable, hash_set and hash_multiset are in namespace __gnu_cxx. include/backward/hashtable.h: hash and hashtable are in namespace __gnu_cxx. include/backward/rope.h: char_producer, sequence_buffer, rope, crope and wrope are in namespace __gnu_cxx. include/backward/slist.h: slist is in namespace __gnu_cxx. * testsuite/backward/header_hash_map_h.cc testsuite/backward/header_hash_set_h.cc testsuite/backward/header_hashtable_h.cc testsuite/backward/header_rope_h.cc testsuite/backward/header_slist_h.cc testsuite/backward/header_tempbuf_h.cc: New tests for checking that we're using the correct namespace. From-SVN: r50956 --- libstdc++-v3/ChangeLog | 19 ++++++++++++ libstdc++-v3/include/backward/hash_map.h | 8 ++--- libstdc++-v3/include/backward/hash_set.h | 8 ++--- libstdc++-v3/include/backward/hashtable.h | 4 +-- libstdc++-v3/include/backward/rope.h | 10 +++--- libstdc++-v3/include/backward/slist.h | 2 +- .../testsuite/backward/header_hash_map_h.cc | 31 +++++++++++++++++++ .../testsuite/backward/header_hash_set_h.cc | 31 +++++++++++++++++++ .../testsuite/backward/header_hashtable_h.cc | 31 +++++++++++++++++++ .../testsuite/backward/header_rope_h.cc | 31 +++++++++++++++++++ .../testsuite/backward/header_slist_h.cc | 31 +++++++++++++++++++ .../testsuite/backward/header_tempbuf_h.cc | 31 +++++++++++++++++++ 12 files changed, 221 insertions(+), 16 deletions(-) create mode 100644 libstdc++-v3/testsuite/backward/header_hash_map_h.cc create mode 100644 libstdc++-v3/testsuite/backward/header_hash_set_h.cc create mode 100644 libstdc++-v3/testsuite/backward/header_hashtable_h.cc create mode 100644 libstdc++-v3/testsuite/backward/header_rope_h.cc create mode 100644 libstdc++-v3/testsuite/backward/header_slist_h.cc create mode 100644 libstdc++-v3/testsuite/backward/header_tempbuf_h.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 718f0dc33938..92121fe8f70d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,22 @@ +2002-03-15 Philipp Thomas + + * include/backward/hash_map.h: hash, hashtable, hash_map and + hash_multimap are in namespace __gnu_cxx. + include/backward/hash_set.h: hash, hashtable, hash_set and + hash_multiset are in namespace __gnu_cxx. + include/backward/hashtable.h: hash and hashtable are in + namespace __gnu_cxx. + include/backward/rope.h: char_producer, sequence_buffer, + rope, crope and wrope are in namespace __gnu_cxx. + include/backward/slist.h: slist is in namespace __gnu_cxx. + * testsuite/backward/header_hash_map_h.cc + testsuite/backward/header_hash_set_h.cc + testsuite/backward/header_hashtable_h.cc + testsuite/backward/header_rope_h.cc + testsuite/backward/header_slist_h.cc + testsuite/backward/header_tempbuf_h.cc: New tests for + checking that we're using the correct namespace. + 2002-03-17 Jason Merrill PR c++/4381 diff --git a/libstdc++-v3/include/backward/hash_map.h b/libstdc++-v3/include/backward/hash_map.h index 7976bb3c48e7..25c177abb160 100644 --- a/libstdc++-v3/include/backward/hash_map.h +++ b/libstdc++-v3/include/backward/hash_map.h @@ -60,10 +60,10 @@ #include "algobase.h" #include -using std::hash; -using std::hashtable; -using std::hash_map; -using std::hash_multimap; +using __gnu_cxx::hash; +using __gnu_cxx::hashtable; +using __gnu_cxx::hash_map; +using __gnu_cxx::hash_multimap; #endif /* _CPP_BACKWARD_HASH_MAP_H */ diff --git a/libstdc++-v3/include/backward/hash_set.h b/libstdc++-v3/include/backward/hash_set.h index ce4539b73f40..ddb7a755e565 100644 --- a/libstdc++-v3/include/backward/hash_set.h +++ b/libstdc++-v3/include/backward/hash_set.h @@ -60,10 +60,10 @@ #include "algobase.h" #include -using std::hash; -using std::hashtable; -using std::hash_set; -using std::hash_multiset; +using __gnu_cxx::hash; +using __gnu_cxx::hashtable; +using __gnu_cxx::hash_set; +using __gnu_cxx::hash_multiset; #endif /* _CPP_BACKWARD_HASH_SET_H */ diff --git a/libstdc++-v3/include/backward/hashtable.h b/libstdc++-v3/include/backward/hashtable.h index 06d60986306d..bbad51646793 100644 --- a/libstdc++-v3/include/backward/hashtable.h +++ b/libstdc++-v3/include/backward/hashtable.h @@ -66,8 +66,8 @@ #include "alloc.h" #include "vector.h" -using std::hash; -using std::hashtable; +using __gnu_cxx::hash; +using __gnu_cxx::hashtable; #endif /* _CPP_BACKWARD_HASHTABLE_H */ diff --git a/libstdc++-v3/include/backward/rope.h b/libstdc++-v3/include/backward/rope.h index bcb43ec748ac..5f4c78752954 100644 --- a/libstdc++-v3/include/backward/rope.h +++ b/libstdc++-v3/include/backward/rope.h @@ -47,11 +47,11 @@ #include "hashtable.h" #include -using std::char_producer; -using std::sequence_buffer; -using std::rope; -using std::crope; -using std::wrope; +using __gnu_cxx::char_producer; +using __gnu_cxx::sequence_buffer; +using __gnu_cxx::rope; +using __gnu_cxx::crope; +using __gnu_cxx::wrope; #endif /* _CPP_BACKWARD_ROPE_H */ diff --git a/libstdc++-v3/include/backward/slist.h b/libstdc++-v3/include/backward/slist.h index aee3f80e8920..decf04df6616 100644 --- a/libstdc++-v3/include/backward/slist.h +++ b/libstdc++-v3/include/backward/slist.h @@ -47,7 +47,7 @@ #include "backward_warning.h" #include -using std::slist; +using __gnu_cxx::slist; #endif /* _CPP_BACKWARD_SLIST_H */ diff --git a/libstdc++-v3/testsuite/backward/header_hash_map_h.cc b/libstdc++-v3/testsuite/backward/header_hash_map_h.cc new file mode 100644 index 000000000000..dfae6081bbaa --- /dev/null +++ b/libstdc++-v3/testsuite/backward/header_hash_map_h.cc @@ -0,0 +1,31 @@ +// 2002-03-15 Philipp Thomas + +// Copyright (C) 2001 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. + +// backward header hash_map.h + +#include +#include + +// { dg-options "-Wno-deprecated" } + +int main(void) +{ + return 0; +} diff --git a/libstdc++-v3/testsuite/backward/header_hash_set_h.cc b/libstdc++-v3/testsuite/backward/header_hash_set_h.cc new file mode 100644 index 000000000000..bb0882a35ccf --- /dev/null +++ b/libstdc++-v3/testsuite/backward/header_hash_set_h.cc @@ -0,0 +1,31 @@ +// 2002-03-15 Philipp Thomas + +// Copyright (C) 2001 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. + +// backward header hash_set.h + +#include +#include + +// { dg-options "-Wno-deprecated" } + +int main(void) +{ + return 0; +} diff --git a/libstdc++-v3/testsuite/backward/header_hashtable_h.cc b/libstdc++-v3/testsuite/backward/header_hashtable_h.cc new file mode 100644 index 000000000000..e407e1a48ab5 --- /dev/null +++ b/libstdc++-v3/testsuite/backward/header_hashtable_h.cc @@ -0,0 +1,31 @@ +// 2002-03-15 Philipp Thomas + +// Copyright (C) 2001 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. + +// backward header hashtable.h + +#include +#include + +// { dg-options "-Wno-deprecated" } + +int main(void) +{ + return 0; +} diff --git a/libstdc++-v3/testsuite/backward/header_rope_h.cc b/libstdc++-v3/testsuite/backward/header_rope_h.cc new file mode 100644 index 000000000000..1bb94f19a7ee --- /dev/null +++ b/libstdc++-v3/testsuite/backward/header_rope_h.cc @@ -0,0 +1,31 @@ +// 2002-03-15 Philipp Thomas + +// Copyright (C) 2001 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. + +// backward header rope.h + +#include +#include + +// { dg-options "-Wno-deprecated" } + +int main(void) +{ + return 0; +} diff --git a/libstdc++-v3/testsuite/backward/header_slist_h.cc b/libstdc++-v3/testsuite/backward/header_slist_h.cc new file mode 100644 index 000000000000..7d76d2aae80c --- /dev/null +++ b/libstdc++-v3/testsuite/backward/header_slist_h.cc @@ -0,0 +1,31 @@ +// 2002-03-15 Philipp Thomas + +// Copyright (C) 2001 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. + +// backward header slist.h + +#include +#include + +// { dg-options "-Wno-deprecated" } + +int main(void) +{ + return 0; +} diff --git a/libstdc++-v3/testsuite/backward/header_tempbuf_h.cc b/libstdc++-v3/testsuite/backward/header_tempbuf_h.cc new file mode 100644 index 000000000000..16a6491a3267 --- /dev/null +++ b/libstdc++-v3/testsuite/backward/header_tempbuf_h.cc @@ -0,0 +1,31 @@ +// 2002-03-15 Philipp Thomas + +// Copyright (C) 2001 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. + +// backward header tempbuf.h + +#include +#include + +// { dg-options "-Wno-deprecated" } + +int main(void) +{ + return 0; +}