diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-06-25 08:39:31 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-06-25 08:39:31 +0000 |
| commit | 6cdbb7e8a1f92fcc2504d56d68ff981803d499a7 (patch) | |
| tree | 1b9111d7231afb6954a4bb0c7cd4898aea19dbd5 | |
| parent | 8a845901e416539127df54145b12e21f478a073e (diff) | |
| download | gcc-6cdbb7e8a1f92fcc2504d56d68ff981803d499a7.zip gcc-6cdbb7e8a1f92fcc2504d56d68ff981803d499a7.tar.gz gcc-6cdbb7e8a1f92fcc2504d56d68ff981803d499a7.tar.bz2 | |
re PR libstdc++/57704 (std::char_traits<char>::lt is not standards-compliant)
2013-06-25 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/57704
* include/bits/char_traits.h (char_traits<char>::lt): Implement
LWG 467.
* testsuite/21_strings/char_traits/requirements/char/57704.cc: New.
From-SVN: r200392
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/char_traits.h | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc | 37 |
3 files changed, 49 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 27142f3..b7a10c1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-06-25 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/57704 + * include/bits/char_traits.h (char_traits<char>::lt): Implement + LWG 467. + * testsuite/21_strings/char_traits/requirements/char/57704.cc: New. + 2013-06-24 Bernd Edlinger <bernd.edlinger@hotmail.de> PR libstdc++/57691 diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index c293495..0d0f7cc 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -248,7 +248,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static _GLIBCXX_CONSTEXPR bool lt(const char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT - { return __c1 < __c2; } + { + // LWG 467. + return (static_cast<unsigned char>(__c1) + < static_cast<unsigned char>(__c2)); + } static int compare(const char_type* __s1, const char_type* __s2, size_t __n) diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc new file mode 100644 index 0000000..7873d0d --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc @@ -0,0 +1,37 @@ +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <string> +#include <testsuite_hooks.h> + +void test01() +{ + bool test __attribute__((unused)) = true; + + char a = '\x7f'; + char b = '\x80'; + + VERIFY( (std::char_traits<char>::lt(a, b) + == (static_cast<unsigned char>(a) + < static_cast<unsigned char>(b))) ); +} + +int main() +{ + test01(); + return 0; +} |