diff options
| -rw-r--r-- | ui/base/l10n/l10n_util.cc | 12 | ||||
| -rw-r--r-- | ui/base/l10n/l10n_util_collator.h | 14 |
2 files changed, 11 insertions, 15 deletions
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index a74719b..2a93d61 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -824,18 +824,6 @@ base::string16 GetStringFUTF16Int(int message_id, int64 a) { return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::Int64ToString(a))); } -// Specialization of operator() method for base::string16 version. -template <> -bool StringComparator<base::string16>::operator()(const base::string16& lhs, - const base::string16& rhs) { - // If we can not get collator instance for specified locale, just do simple - // string compare. - if (!collator_) - return lhs < rhs; - return base::i18n::CompareString16WithCollator(collator_, lhs, rhs) == - UCOL_LESS; -}; - base::string16 GetPluralStringFUTF16(const std::vector<int>& message_ids, int number) { scoped_ptr<icu::PluralFormat> format = BuildPluralFormat(message_ids); diff --git a/ui/base/l10n/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h index e1b91ab..f364e5c 100644 --- a/ui/base/l10n/l10n_util_collator.h +++ b/ui/base/l10n/l10n_util_collator.h @@ -106,9 +106,17 @@ class StringComparator : public std::binary_function<const Element&, }; // Specialization of operator() method for base::string16 version. -template <> UI_BASE_EXPORT -bool StringComparator<base::string16>::operator()(const base::string16& lhs, - const base::string16& rhs); +template <> +UI_BASE_EXPORT inline bool StringComparator<base::string16>::operator()( + const base::string16& lhs, + const base::string16& rhs) { + // If we can not get collator instance for specified locale, just do simple + // string compare. + if (!collator_) + return lhs < rhs; + return base::i18n::CompareString16WithCollator(collator_, lhs, rhs) == + UCOL_LESS; +} // In place sorting of |elements| of a vector according to the string key of // each element in the vector by using collation rules for |locale|. |