diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-09 06:30:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-09 06:30:11 +0000 |
| commit | ad6662e325dc0c74b2e43386d504882468fcb0df (patch) | |
| tree | f7b7ae5693568f23ed38d72cb4b57bced3dc8365 /linguistic/source/convdic.hxx | |
| parent | b8bc59d131aeff101dff7f502213a3c501c9eea7 (diff) | |
INTEGRATION: CWS ooo20040704 (1.4.12); FILE MERGED
2004/07/02 11:00:58 cmc 1.4.12.2: #i30891# revert header and namespace change
2004/06/28 12:45:02 cmc 1.4.12.1: #i30801 allow using system stl if possible
Diffstat (limited to 'linguistic/source/convdic.hxx')
| -rw-r--r-- | linguistic/source/convdic.hxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 091113c0bc5a..cac0df55df8f 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -2,9 +2,9 @@ * * $RCSfile: convdic.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2004-07-30 15:30:11 $ + * last change: $Author: rt $ $Date: 2004-09-09 07:30:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,8 +83,8 @@ #include <tools/string.hxx> #endif -#include <stl/hash_map> -#include <stl/set> +#include <hash_map> +#include <set> #ifndef _LINGUISTIC_MISC_HXX_ #include "misc.hxx" @@ -124,19 +124,8 @@ struct StrEQ } }; -namespace std -{ -template <> struct hash< const rtl::OUString > -{ - inline size_t operator()( const rtl::OUString &rTxt ) const - { - return (size_t) rTxt.hashCode(); - } -}; -} - typedef std::hash_multimap< const rtl::OUString, const rtl::OUString, - std::hash< const rtl::OUString >, StrEQ > ConvMap; + const rtl::OUStringHash, StrEQ > ConvMap; typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; |