This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Backward headers need fixing re. namespace
- From: Philipp Thomas <pthomas at suse dot de>
- To: gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Cc: bkoz at redhat dot com, Paolo Carlini <pcarlini at unitus dot it>
- Date: Fri, 15 Mar 2002 16:22:12 +0100
- Subject: Backward headers need fixing re. namespace
Seems like some things where moved to namespace __gnu_cxx but the backward
headers weren't kept up-to-date. Here is a patch to fix that.
OK for mainline and branch?
2002-03-15 Philipp Thomas <pthomas@suse.de>
* 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.
Index: libstdc++-v3/include/backward/hash_map.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hash_map.h,v
retrieving revision 1.7
diff -u -r1.7 libstdc++-v3/include/backward/hash_map.h
--- libstdc++-v3/include/backward/hash_map.h 2001/06/27 17:09:52 1.7
+++ libstdc++-v3/include/backward/hash_map.h 2002/03/15 14:21:02
@@ -60,10 +60,10 @@
#include "algobase.h"
#include <ext/hash_map>
-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 */
Index: libstdc++-v3/include/backward/hash_set.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hash_set.h,v
retrieving revision 1.7
diff -u -r1.7 libstdc++-v3/include/backward/hash_set.h
--- libstdc++-v3/include/backward/hash_set.h 2001/06/27 17:09:52 1.7
+++ libstdc++-v3/include/backward/hash_set.h 2002/03/15 14:21:02
@@ -60,10 +60,10 @@
#include "algobase.h"
#include <ext/hash_set>
-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 */
Index: libstdc++-v3/include/backward/hashtable.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hashtable.h,v
retrieving revision 1.7
diff -u -r1.7 libstdc++-v3/include/backward/hashtable.h
--- libstdc++-v3/include/backward/hashtable.h 2001/06/27 17:09:52 1.7
+++ libstdc++-v3/include/backward/hashtable.h 2002/03/15 14:21:02
@@ -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 */
Index: libstdc++-v3/include/backward/rope.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/rope.h,v
retrieving revision 1.8
diff -u -r1.8 libstdc++-v3/include/backward/rope.h
--- libstdc++-v3/include/backward/rope.h 2001/06/27 17:09:52 1.8
+++ libstdc++-v3/include/backward/rope.h 2002/03/15 14:21:02
@@ -47,11 +47,11 @@
#include "hashtable.h"
#include <ext/rope>
-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 */
Index: libstdc++-v3/include/backward/slist.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/slist.h,v
retrieving revision 1.6
diff -u -r1.6 libstdc++-v3/include/backward/slist.h
--- libstdc++-v3/include/backward/slist.h 2001/06/27 17:09:52 1.6
+++ libstdc++-v3/include/backward/slist.h 2002/03/15 14:21:02
@@ -47,7 +47,7 @@
#include "backward_warning.h"
#include <ext/slist>
-using std::slist;
+using __gnu_cxx::slist;
#endif /* _CPP_BACKWARD_SLIST_H */
--
Philipp Thomas <pthomas@suse.de>
SuSE Linux AG, Deutscherrnstr. 15-19, D-90429 Nuremberg, Germany