diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 13:47:37 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 13:47:37 +0000 |
commit | e86b66bd8d7260f52499c94e944d652ee84b76dd (patch) | |
tree | 2a8cd5f6182909d88a24e6751d5f98c0bc99f155 /stlport | |
parent | INTEGRATION: CWS cmcfixes2 (1.27.10); FILE MERGED (diff) | |
download | core-e86b66bd8d7260f52499c94e944d652ee84b76dd.tar.gz core-e86b66bd8d7260f52499c94e944d652ee84b76dd.zip |
INTEGRATION: CWS cmcfixes2 (1.2.12); FILE MERGED
2005/02/10 13:33:28 cmc 1.2.12.1: #i42421# enable extending testing for invalid stl
Diffstat (limited to 'stlport')
-rw-r--r-- | stlport/systemstl/functional | 5 | ||||
-rw-r--r-- | stlport/systemstl/hash_map | 22 |
2 files changed, 23 insertions, 4 deletions
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index fcd3e346584a..b2bc42af3a31 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -2,9 +2,9 @@ * * $RCSfile: functional,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-09-08 16:33:52 $ + * last change: $Author: vg $ $Date: 2005-02-24 14:47:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,7 @@ namespace std using __gnu_cxx::select2nd; using __gnu_cxx::unary_compose; using __gnu_cxx::compose1; + using __gnu_cxx::identity; } #else #error UNSUPPORTED COMPILER diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index 089d5d5b0cb0..0ce5668d51e7 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -2,9 +2,9 @@ * * $RCSfile: hash_map,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-09-08 16:34:02 $ + * last change: $Author: vg $ $Date: 2005-02-24 14:47:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,24 @@ #include <ext/hash_map> #ifdef GCC +namespace __gnu_cxx +{ + template<> struct hash < std::string > + { + size_t operator()(const std::string & x) const + { + return hash< const char* >()(x.c_str()); + } + }; + + template<> struct hash< long long int > + { + size_t operator()(long long int __x) const + { + return __x; + } + }; +} namespace std { using __gnu_cxx::hash; |