From b656faa8831e7d92196b1ba9ef3c494f5f2b7044 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 10 Jan 2004 10:15:35 +0000 Subject: [PATCH] re PR libstdc++/13630 (Wrong type for locale::category) 2004-01-10 Paolo Carlini PR libstdc++/13630 * include/bits/locale_classes.h (class locale): Fix category typedef. * testsuite/22_locale/locale/13630.cc: Add. From-SVN: r75635 --- libstdc++-v3/ChangeLog | 7 ++++ libstdc++-v3/include/bits/locale_classes.h | 2 +- .../testsuite/22_locale/locale/13630.cc | 37 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/22_locale/locale/13630.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e9dc5678f53..a20e904f8ca 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-01-10 Paolo Carlini + + 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 * 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 87f9e2b9cfb..52bf1fc9c31 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 00000000000..aea1085fa3d --- /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 +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + VERIFY( typeid(locale::category) == typeid(int) ); +} + +int main() +{ + test01(); + return 0; +} -- 2.30.2