From 4e2f8bcf6f6bf6809c320aa2bec93261feefd9dd Mon Sep 17 00:00:00 2001 From: "Aaron W. LaFramboise" Date: Mon, 11 Feb 2002 18:56:24 +0000 Subject: [PATCH] locale_facets.tcc (collate::do_hash): Fix. 2002-02-11 Aaron W LaFramboise * include/bits/locale_facets.tcc (collate::do_hash): Fix. * testsuite/22_locale/collate_members_char.cc (test03): New test. * testsuite/22_locale/collate_members_wchar_t.cc (test03): Same. From-SVN: r49682 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/locale_facets.tcc | 2 +- .../22_locale/collate_members_char.cc | 18 +++++++++++++++--- .../22_locale/collate_members_wchar_t.cc | 19 +++++++++++++++---- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8789b9f5f503..68a5a97a04ee 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-02-11 Aaron W LaFramboise + + * include/bits/locale_facets.tcc (collate::do_hash): Fix. + * testsuite/22_locale/collate_members_char.cc (test03): New test. + * testsuite/22_locale/collate_members_wchar_t.cc (test03): Same. + 2002-02-10 Phil Edwards * include/bits/stl_algo.h (transform (both signatures), generate_n): diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index c27b1eec3830..38ee9251dc4d 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1855,7 +1855,7 @@ namespace std unsigned long __val = 0; for (; __lo < __hi; ++__lo) __val = *__lo + ((__val << 7) | - (__val >> (numeric_limits::digits - 1))); + (__val >> (numeric_limits::digits - 7))); return static_cast(__val); } diff --git a/libstdc++-v3/testsuite/22_locale/collate_members_char.cc b/libstdc++-v3/testsuite/22_locale/collate_members_char.cc index ab5fe197dd0d..9e49cbc2f544 100644 --- a/libstdc++-v3/testsuite/22_locale/collate_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/collate_members_char.cc @@ -147,12 +147,24 @@ void test02() #endif } +void test03() +{ + bool test = true; + std::string str1("fffff"); + std::string str2("ffffffffffff"); + + const std::locale cloc = std::locale::classic(); + const std::collate &col = std::use_facet >(cloc); + + long l1 = col.hash(str1.c_str(), str1.c_str() + str1.size()); + long l2 = col.hash(str2.c_str(), str2.c_str() + str2.size()); + VERIFY( l1 != l2 ); +} + int main() { test01(); test02(); + test03(); return 0; } - - - diff --git a/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc index 3eba87af31cf..88e72e07100e 100644 --- a/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc @@ -146,6 +146,20 @@ void test02() } #endif } + +void test03() +{ + bool test = true; + std::wstring str1(L"fffff"); + std::wstring str2(L"ffffffffffff"); + + const std::locale cloc = std::locale::classic(); + const std::collate &col = std::use_facet >(cloc); + + long l1 = col.hash(str1.c_str(), str1.c_str() + str1.size()); + long l2 = col.hash(str2.c_str(), str2.c_str() + str2.size()); + VERIFY( l1 != l2 ); +} #endif int main() @@ -153,10 +167,7 @@ int main() #if _GLIBCPP_USE_WCHAR_T test01(); test02(); + test03(); #endif return 0; } - - - -