* algorithm alloc.h defalloc.h hash_map.h hash_set.h iterator

[pf3gnuchains/gcc-fork.git] / libstdc++ / stl / stl_hash_fun.h

diff --git a/libstdc++/stl/stl_hash_fun.h b/libstdc++/stl/stl_hash_fun.h
index 3afa9dc..44ab9bb 100644 (file)
--- a/libstdc++/stl/stl_hash_fun.h
+++ b/libstdc++/stl/stl_hash_fun.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996
+ * Copyright (c) 1996-1998
  * Silicon Graphics Computer Systems, Inc.
  *
  * Permission to use, copy, modify, distribute and sell this software
@@ -35,53 +35,53 @@
 
 __STL_BEGIN_NAMESPACE
 
-template <class Key> struct hash { };
+template <class _Key> struct hash { };
 
-inline size_t __stl_hash_string(const char* s)
+inline size_t __stl_hash_string(const char* __s)
 {
-  unsigned long h = 0; 
-  for ( ; *s; ++s)
-    h = 5*h + *s;
+  unsigned long __h = 0; 
+  for ( ; *__s; ++__s)
+    __h = 5*__h + *__s;
   
-  return size_t(h);
+  return size_t(__h);
 }
 
 __STL_TEMPLATE_NULL struct hash<char*>
 {
-  size_t operator()(const char* s) const { return __stl_hash_string(s); }
+  size_t operator()(const char* __s) const { return __stl_hash_string(__s); }
 };
 
 __STL_TEMPLATE_NULL struct hash<const char*>
 {
-  size_t operator()(const char* s) const { return __stl_hash_string(s); }
+  size_t operator()(const char* __s) const { return __stl_hash_string(__s); }
 };
 
 __STL_TEMPLATE_NULL struct hash<char> {
-  size_t operator()(char x) const { return x; }
+  size_t operator()(char __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<unsigned char> {
-  size_t operator()(unsigned char x) const { return x; }
+  size_t operator()(unsigned char __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<signed char> {
-  size_t operator()(unsigned char x) const { return x; }
+  size_t operator()(unsigned char __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<short> {
-  size_t operator()(short x) const { return x; }
+  size_t operator()(short __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<unsigned short> {
-  size_t operator()(unsigned short x) const { return x; }
+  size_t operator()(unsigned short __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<int> {
-  size_t operator()(int x) const { return x; }
+  size_t operator()(int __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<unsigned int> {
-  size_t operator()(unsigned int x) const { return x; }
+  size_t operator()(unsigned int __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<long> {
-  size_t operator()(long x) const { return x; }
+  size_t operator()(long __x) const { return __x; }
 };
 __STL_TEMPLATE_NULL struct hash<unsigned long> {
-  size_t operator()(unsigned long x) const { return x; }
+  size_t operator()(unsigned long __x) const { return __x; }
 };
 
 __STL_END_NAMESPACE