diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-01-10 10:15:35 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-01-10 10:15:35 +0000 |
| commit | b656faa8831e7d92196b1ba9ef3c494f5f2b7044 (patch) | |
| tree | 906e97d9b7f3ec0992b643fecaaa137c773179df | |
| parent | fbfb16e2aee25616ddc48e2b22ebf7a2c15e4631 (diff) | |
| download | gcc-b656faa8831e7d92196b1ba9ef3c494f5f2b7044.zip gcc-b656faa8831e7d92196b1ba9ef3c494f5f2b7044.tar.gz gcc-b656faa8831e7d92196b1ba9ef3c494f5f2b7044.tar.bz2 | |
re PR libstdc++/13630 (Wrong type for locale::category)
2004-01-10 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/13630
* include/bits/locale_classes.h (class locale): Fix category typedef.
* testsuite/22_locale/locale/13630.cc: Add.
From-SVN: r75635
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_classes.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/locale/13630.cc | 37 |
3 files changed, 45 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e9dc567..a20e904 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-01-10 Paolo Carlini <pcarlini@suse.de> + + PR libstdc++/13630 + * include/bits/locale_classes.h (class locale): Fix category + typedef. + * testsuite/22_locale/locale/13630.cc: Add. + 2004-01-10 Giovanni Bajo <giovannibajo@gcc.gnu.org> * include/bits/locale_facets.h: Make a name really dependent. This diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h index 87f9e2b..52bf1fc 100644 --- a/libstdc++-v3/include/bits/locale_classes.h +++ b/libstdc++-v3/include/bits/locale_classes.h @@ -69,7 +69,7 @@ namespace std public: // Types: /// Definition of locale::category. - typedef unsigned int category; + typedef int category; // Forward decls and friends: class facet; diff --git a/libstdc++-v3/testsuite/22_locale/locale/13630.cc b/libstdc++-v3/testsuite/22_locale/locale/13630.cc new file mode 100644 index 0000000..aea1085 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/locale/13630.cc @@ -0,0 +1,37 @@ +// Copyright (C) 2004 Free Software Foundation +// +// 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.1.1 class locale [lib.locale] + +#include <locale> +#include <typeinfo> +#include <testsuite_hooks.h> + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + VERIFY( typeid(locale::category) == typeid(int) ); +} + +int main() +{ + test01(); + return 0; +} |