FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

locale_facets.h (ctype<char>): Remove throw specs not in base class signature.

Browse source 
2000-12-13  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/locale_facets.h (ctype<char>): Remove throw specs not in
	base class signature.
	* config/os/*/bits/ctype_inline.h (is): Same.

From-SVN: r38250
This commit is contained in:
Benjamin Kosnik 2000-12-14 09:19:56 +00:00 • committed by Benjamin Kosnik
parent 65b66e1f90
commit 0c3a231d2f
13 changed files with 71 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View file

@ -2,7 +2,8 @@
* include/bits/locale_facets.h (ctype<char>): Remove throw specs not in
base class signature.
* config/os/*/bits/ctype_inline.h (is): Same.
2000-12-13 Benjamin Kosnik <bkoz@redhat.com>
* config/os/generic/bits/ctype_base.h (ctype_base): Consistency

8
libstdc++-v3/config/os/aix/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return __OBJ_DATA(__lc_ctype)->mask[__c] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !this->is(__m, *__low))
++__low;
@ -66,7 +66,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && this->is(__m, *__low) != 0)
++__low;

8
libstdc++-v3/config/os/bsd/freebsd/bits/ctype_inline.h
View file

@ -36,7 +36,7 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{
if (__m & (digit | xdigit))
return __isctype(__c, __m);
@ -46,7 +46,7 @@
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -62,7 +62,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !this->is(__m, *__low))
++__low;
@ -71,7 +71,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && this->is(__m, *__low) != 0)
++__low;

9
libstdc++-v3/config/os/bsd/netbsd/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return _M_table[(unsigned char)(__c)] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !this->is(__m, *__low))
++__low;
@ -66,7 +66,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && this->is(__m, *__low) != 0)
++__low;
@ -77,3 +77,4 @@

8
libstdc++-v3/config/os/generic/bits/ctype_inline.h
View file

@ -41,7 +41,7 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{
bool __ret;
switch (__m)
@ -88,7 +88,7 @@
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = 11; // Highest bitmask in ctype_base == 10
for (;__low < __high; ++__vec, ++__low)
@ -104,7 +104,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !this->is(__m, *__low))
++__low;
@ -113,7 +113,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && this->is(__m, *__low) != 0)
++__low;

8
libstdc++-v3/config/os/gnu-linux/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return _M_table[__c] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !(_M_table[*__low] & __m))
++__low;
@ -66,7 +66,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high
&& (_M_table[*__low] & __m) != 0)

34
libstdc++-v3/config/os/hpux/bits/ctype_base.h
View file

@ -1,6 +1,6 @@
// Locale support -*- C++ -*-
// Copyright (C) 1997-1999 Free Software Foundation, Inc.
// Copyright (C) 1997-1999, 2000 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
@ -35,25 +35,21 @@
struct ctype_base
{
typedef unsigned int mask;
// Non-standard typedefs.
typedef const int* __to_type;
enum
{
space = (1 << 5), // Whitespace
print = (1 << 6), // Printing
cntrl = (1 << 9), // Control character
upper = (1 << 0), // UPPERCASE
lower = (1 << 1), // lowercase
alpha = (1 << 5), // Alphabetic
digit = (1 << 2), // Numeric
punct = (1 << 10),// Punctuation
xdigit = (1 << 4),// Hexadecimal numeric
alnum = (1 << 11),// Alphanumeric
graph = (1 << 7) // Graphical
};
// NB: Offsets into ctype<char>::_M_table force a particular size
// on the mask type. Because of this, we don't use an enum.
typedef unsigned int mask;
static const mask upper = 1 << 0;
static const mask lower = 1 << 1;
static const mask alpha = 1 << 2;
static const mask digit = 1 << 3;
static const mask xdigit = 1 << 4;
static const mask space = 1 << 5;
static const mask print = 1 << 6;
static const mask graph = 1 << 7;
static const mask cntrl = 1 << 8;
static const mask punct = 1 << 9;
static const mask alnum = 1 << 10;
};

19
libstdc++-v3/config/os/hpux/bits/ctype_inline.h
View file

@ -36,21 +36,28 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return _M_table[(unsigned char)(__c)] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
while (__low < __high)
*__vec++ = _M_table[(unsigned char)(*__low++)];
const int __bitmasksize = 11; // Highest bitmask in ctype_base == 10
for (;__low < __high; ++__vec, ++__low)
{
mask __m = _M_table[*__low];
int __i = 0; // Lowest bitmask in ctype_base == 0
while (__i < __bitmasksize && !(__m & static_cast<mask>(1 << __i)))
++__i;
*__vec = static_cast<mask>(1 << __i);
}
return __high;
}
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !this->is(__m, *__low))
++__low;
@ -59,7 +66,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && this->is(__m, *__low) != 0)
++__low;

8
libstdc++-v3/config/os/irix/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return (_M_table)[__c] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !((_M_table)[*__low] & __m))
++__low;
@ -66,7 +66,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && ((_M_table + 1)[*__low] & __m) != 0)
++__low;

8
libstdc++-v3/config/os/newlib/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return (_M_table + 1)[(unsigned char)(__c)] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !((_M_table + 1)[(unsigned char)(*__low)] & __m))
++__low;
@ -66,7 +66,7 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high
&& ((_M_table + 1)[(unsigned char)(*__low)] & __m) != 0)

13
libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return (_M_table + 1)[(unsigned char)(__c)] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !((_M_table + 1)[(unsigned char)(*__low)] & __m))
++__low;
@ -66,15 +66,10 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high
&& ((_M_table + 1)[(unsigned char)(*__low)] & __m) != 0)
++__low;
return __low;
}

13
libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return _M_table[__c] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !(_M_table[*__low] & __m))
++__low;
@ -66,15 +66,10 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high
&& (_M_table[*__low] & __m) != 0)
++__low;
return __low;
}

13
libstdc++-v3/config/os/solaris/solaris2.7/bits/ctype_inline.h
View file

@ -36,12 +36,12 @@
bool
ctype<char>::
is(mask __m, char __c) const throw()
is(mask __m, char __c) const
{ return _M_table[__c] & __m; }
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const throw()
is(const char* __low, const char* __high, mask* __vec) const
{
const int __bitmasksize = sizeof(mask) * 8;
for (;__low < __high; ++__vec, ++__low)
@ -57,7 +57,7 @@
const char*
ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const throw()
scan_is(mask __m, const char* __low, const char* __high) const
{
while (__low < __high && !(_M_table[*__low] & __m))
++__low;
@ -66,15 +66,10 @@
const char*
ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const throw()
scan_not(mask __m, const char* __low, const char* __high) const
{
while (__low < __high
&& (_M_table[*__low] & __m) != 0)
++__low;
return __low;
}