diff options
author | Chris Gregory <czipperz@gmail.com> | 2016-04-29 16:11:43 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-04-29 17:11:43 +0100 |
commit | f92ab29ffac7b8012c4787be66a43c08923c3663 (patch) | |
tree | 6fc3bcf79e417c6b1b8b408b428be97042699596 /libstdc++-v3/config/os | |
parent | 8960db319597b6efca5063e70a787fcc822129fe (diff) | |
download | gcc-f92ab29ffac7b8012c4787be66a43c08923c3663.zip gcc-f92ab29ffac7b8012c4787be66a43c08923c3663.tar.gz gcc-f92ab29ffac7b8012c4787be66a43c08923c3663.tar.bz2 |
Remove trailing whitespace from libstdc++-v3 files
2016-04-29 Chris Gregory <czipperz@gmail.com>
* config/*: Remove trailing whitespace.
* src/*: Likewise.
* testsuite/tr1/*: Likewise.
* testsuite/util/*: Likewise.
From-SVN: r235645
Diffstat (limited to 'libstdc++-v3/config/os')
32 files changed, 147 insertions, 147 deletions
diff --git a/libstdc++-v3/config/os/aix/ctype_base.h b/libstdc++-v3/config/os/aix/ctype_base.h index 6ce922b..c7d4e05 100644 --- a/libstdc++-v3/config/os/aix/ctype_base.h +++ b/libstdc++-v3/config/os/aix/ctype_base.h @@ -25,9 +25,9 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from /usr/include/ctype.h - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/os/aix/ctype_inline.h b/libstdc++-v3/config/os/aix/ctype_inline.h index 3b60557..2ecd857 100644 --- a/libstdc++-v3/config/os/aix/ctype_inline.h +++ b/libstdc++-v3/config/os/aix/ctype_inline.h @@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool ctype<char>:: is(mask __m, char __c) const - { + { if(_M_table) return _M_table[static_cast<unsigned char>(__c)] & __m; else diff --git a/libstdc++-v3/config/os/bsd/darwin/ctype_base.h b/libstdc++-v3/config/os/bsd/darwin/ctype_base.h index 993822e..85dabcf 100644 --- a/libstdc++-v3/config/os/bsd/darwin/ctype_base.h +++ b/libstdc++-v3/config/os/bsd/darwin/ctype_base.h @@ -25,11 +25,11 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4, // 4.0 and all versions of the CVS managed file at: // :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/os/bsd/darwin/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/darwin/ctype_configure_char.cc index 0926044..9f35532 100644 --- a/libstdc++-v3/config/os/bsd/darwin/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/bsd/darwin/ctype_configure_char.cc @@ -37,28 +37,28 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION // Information as gleaned from /usr/include/ctype.h - + const ctype_base::mask* ctype<char>::classic_table() throw() { return 0; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_table(__table ? __table : classic_table()) - { + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); _M_narrow_ok = 0; } - ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_table(__table ? __table : classic_table()) - { + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return ::tolower((int) __c); } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/bsd/darwin/ctype_inline.h b/libstdc++-v3/config/os/bsd/darwin/ctype_inline.h index 306d8b8..8ac8847 100644 --- a/libstdc++-v3/config/os/bsd/darwin/ctype_inline.h +++ b/libstdc++-v3/config/os/bsd/darwin/ctype_inline.h @@ -30,10 +30,10 @@ // // ISO C++ 14882: 22.1 Locales // - + // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool ctype<char>:: is(mask __m, char __c) const - { + { if (_M_table) return _M_table[static_cast<unsigned char>(__c)] & __m; else @@ -111,7 +111,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __low; } -#ifdef _GLIBCXX_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T inline bool ctype<wchar_t>:: do_is(mask __m, wchar_t __c) const @@ -119,7 +119,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __istype (__c, __m); } - inline const wchar_t* + inline const wchar_t* ctype<wchar_t>:: do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const { @@ -129,8 +129,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION | blank); return __hi; } - - inline const wchar_t* + + inline const wchar_t* ctype<wchar_t>:: do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const { diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h index ae0d08f..cdd9a80 100644 --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h @@ -25,12 +25,12 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from /usr/include/ctype.h on NetBSD. // Full details can be found from the CVS files at: // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h // See www.netbsd.org for details of access. - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc index 3d627c1..bf11c9c 100644 --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc @@ -44,23 +44,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::classic_table() throw() { return _C_ctype_ + 1; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : classic_table()) - { + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); _M_narrow_ok = 0; } - ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : classic_table()) - { + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -86,7 +86,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return ::tolower((int) __c); } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h index e7c33d0..88a1e09 100644 --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h @@ -30,10 +30,10 @@ // // ISO C++ 14882: 22.1 Locales // - + // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/os/djgpp/ctype_base.h b/libstdc++-v3/config/os/djgpp/ctype_base.h index c86f643..451973a 100644 --- a/libstdc++-v3/config/os/djgpp/ctype_base.h +++ b/libstdc++-v3/config/os/djgpp/ctype_base.h @@ -25,7 +25,7 @@ // // ISO C++ 14882: 22.1 Locales // - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -34,7 +34,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct ctype_base { typedef unsigned short mask; - + // Non-standard typedefs. typedef unsigned char * __to_type; diff --git a/libstdc++-v3/config/os/djgpp/error_constants.h b/libstdc++-v3/config/os/djgpp/error_constants.h index 3275b21..41b266a 100644 --- a/libstdc++-v3/config/os/djgpp/error_constants.h +++ b/libstdc++-v3/config/os/djgpp/error_constants.h @@ -93,10 +93,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION no_lock_available = ENOLCK, #ifdef _GLIBCXX_HAVE_ENODATA - no_message_available = ENODATA, + no_message_available = ENODATA, #endif -// no_message = ENOMSG, +// no_message = ENOMSG, // no_protocol_option = ENOPROTOOPT, no_space_on_device = ENOSPC, diff --git a/libstdc++-v3/config/os/generic/ctype_configure_char.cc b/libstdc++-v3/config/os/generic/ctype_configure_char.cc index af2012e..9f35532 100644 --- a/libstdc++-v3/config/os/generic/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/generic/ctype_configure_char.cc @@ -42,23 +42,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::classic_table() throw() { return 0; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_table(__table ? __table : classic_table()) - { + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); _M_narrow_ok = 0; } - ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : classic_table()) - { + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return ::tolower((int) __c); } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/generic/ctype_inline.h b/libstdc++-v3/config/os/generic/ctype_inline.h index 3347d33..2ec02ae 100644 --- a/libstdc++-v3/config/os/generic/ctype_inline.h +++ b/libstdc++-v3/config/os/generic/ctype_inline.h @@ -30,10 +30,10 @@ // // ISO C++ 14882: 22.1 Locales // - + // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + // The following definitions are portable, but insanely slow. If one // cares at all about performance, then specialized ctype // functionality should be added for the native os in question: see @@ -48,13 +48,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool ctype<char>:: is(mask __m, char __c) const - { + { if (_M_table) return _M_table[static_cast<unsigned char>(__c)] & __m; else { bool __ret = false; - const size_t __bitmasksize = 15; + const size_t __bitmasksize = 15; size_t __bitcur = 0; // Lowest bitmask in ctype_base == 0 for (; __bitcur <= __bitmasksize; ++__bitcur) { @@ -112,7 +112,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __ret; } } - + const char* ctype<char>:: is(const char* __low, const char* __high, mask* __vec) const @@ -123,12 +123,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else { // Highest bitmask in ctype_base == 11. - const size_t __bitmasksize = 15; + const size_t __bitmasksize = 15; for (;__low < __high; ++__vec, ++__low) { mask __m = 0; // Lowest bitmask in ctype_base == 0 - size_t __i = 0; + size_t __i = 0; for (;__i <= __bitmasksize; ++__i) { const mask __bit = static_cast<mask>(1 << __i); diff --git a/libstdc++-v3/config/os/generic/error_constants.h b/libstdc++-v3/config/os/generic/error_constants.h index f5bb12c..57e97f8 100644 --- a/libstdc++-v3/config/os/generic/error_constants.h +++ b/libstdc++-v3/config/os/generic/error_constants.h @@ -93,10 +93,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION no_lock_available = ENOLCK, #ifdef _GLIBCXX_HAVE_ENODATA - no_message_available = ENODATA, + no_message_available = ENODATA, #endif - no_message = ENOMSG, + no_message = ENOMSG, no_protocol_option = ENOPROTOOPT, no_space_on_device = ENOSPC, diff --git a/libstdc++-v3/config/os/hpux/ctype_base.h b/libstdc++-v3/config/os/hpux/ctype_base.h index 32a00ee..cfe8e90 100644 --- a/libstdc++-v3/config/os/hpux/ctype_base.h +++ b/libstdc++-v3/config/os/hpux/ctype_base.h @@ -25,9 +25,9 @@ // // ISO C++ 14882: 22.1 Locales // - + // Default information, may not be appropriate for specific host. - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -40,7 +40,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 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; + typedef unsigned int mask; static const mask upper = _ISUPPER; static const mask lower = _ISLOWER; static const mask alpha = _ISALPHA; diff --git a/libstdc++-v3/config/os/hpux/ctype_configure_char.cc b/libstdc++-v3/config/os/hpux/ctype_configure_char.cc index 38b0699..02f8e32 100644 --- a/libstdc++-v3/config/os/hpux/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/hpux/ctype_configure_char.cc @@ -42,23 +42,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::classic_table() throw() { return __SB_masks; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_table(__table ? __table : (const mask *) __SB_masks) - { + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : (const mask *) __SB_masks) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); _M_narrow_ok = 0; } - ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_table(__table ? __table : (const mask *) __SB_masks) - { + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : (const mask *) __SB_masks) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return ::tolower((int) __c); } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/hpux/ctype_inline.h b/libstdc++-v3/config/os/hpux/ctype_inline.h index 54f817b..e62f5f3 100644 --- a/libstdc++-v3/config/os/hpux/ctype_inline.h +++ b/libstdc++-v3/config/os/hpux/ctype_inline.h @@ -21,7 +21,7 @@ // a copy of the GCC Runtime Library Exception along with this program; // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // <http://www.gnu.org/licenses/>. - + /** @file bits/ctype_inline.h * This is an internal header file, included by other library headers. * Do not attempt to use it directly. @headername{locale} @@ -33,7 +33,7 @@ // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_is(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && !(_M_table[static_cast<unsigned char>(*__low)] & __m)) ++__low; return __low; @@ -66,7 +66,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_not(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0) ++__low; return __low; diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h index e034725..528b7b7 100644 --- a/libstdc++-v3/config/os/hpux/os_defines.h +++ b/libstdc++-v3/config/os/hpux/os_defines.h @@ -43,7 +43,7 @@ everyone else, they put them into a non-standard header <inttypes.h>. Ugh. - <inttypes.h> defines a variety of things, some of which we + <inttypes.h> defines a variety of things, some of which we probably do not want. So we don't want to include it here. Luckily we can just declare strtoll and strtoull with the @@ -60,7 +60,7 @@ #ifdef __cplusplus namespace std { - extern "C" + extern "C" { #ifndef __LP64__ __extension__ long long strtoll (const char *, char **, int) @@ -80,7 +80,7 @@ namespace std #define _GLIBCXX_USE_LONG_LONG 1 // HPUX on IA64 requires vtable to be 64 bit aligned even at 32 bit -// mode. We need to pad the vtable structure to achieve this. +// mode. We need to pad the vtable structure to achieve this. #if !defined(_LP64) && defined (__ia64__) #define _GLIBCXX_VTABLE_PADDING 8 typedef long int __padding_type; @@ -105,7 +105,7 @@ typedef long int __padding_type; // The strtold function is obsolete and not C99 conformant on PA HP-UX. // It returns plus or minus _LDBL_MAX instead of plus or minus HUGE_VALL // if the correct value would cause overflow. It doesn't handle "inf", -// "infinity" and "nan". It is not thread safe. +// "infinity" and "nan". It is not thread safe. #if defined (__hppa__) #define _GLIBCXX_HAVE_BROKEN_STRTOLD 1 #endif diff --git a/libstdc++-v3/config/os/mingw32-w64/ctype_base.h b/libstdc++-v3/config/os/mingw32-w64/ctype_base.h index 9b16c19..ef17a30 100644 --- a/libstdc++-v3/config/os/mingw32-w64/ctype_base.h +++ b/libstdc++-v3/config/os/mingw32-w64/ctype_base.h @@ -46,7 +46,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 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 short mask; + typedef unsigned short mask; static const mask upper = 1 << 0; static const mask lower = 1 << 1; static const mask alpha = 1 << 2; diff --git a/libstdc++-v3/config/os/mingw32/ctype_base.h b/libstdc++-v3/config/os/mingw32/ctype_base.h index 9b16c19..ef17a30 100644 --- a/libstdc++-v3/config/os/mingw32/ctype_base.h +++ b/libstdc++-v3/config/os/mingw32/ctype_base.h @@ -46,7 +46,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 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 short mask; + typedef unsigned short mask; static const mask upper = 1 << 0; static const mask lower = 1 << 1; static const mask alpha = 1 << 2; diff --git a/libstdc++-v3/config/os/newlib/ctype_base.h b/libstdc++-v3/config/os/newlib/ctype_base.h index 9cf2ecf..717303e 100644 --- a/libstdc++-v3/config/os/newlib/ctype_base.h +++ b/libstdc++-v3/config/os/newlib/ctype_base.h @@ -25,7 +25,7 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from /usr/include/ctype.h namespace std _GLIBCXX_VISIBILITY(default) diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/ctype_configure_char.cc b/libstdc++-v3/config/os/qnx/qnx6.1/ctype_configure_char.cc index 03eaf6b..cadfeca 100644 --- a/libstdc++-v3/config/os/qnx/qnx6.1/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/qnx/qnx6.1/ctype_configure_char.cc @@ -37,26 +37,26 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION // Information as gleaned from /usr/include/ctype.h - + const ctype_base::mask* ctype<char>::classic_table() throw() { return 0; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : _Ctype) - { + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); _M_narrow_ok = 0; } - ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : _Ctype) - { + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -82,7 +82,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return ::tolower((int) __c); } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/ctype_inline.h b/libstdc++-v3/config/os/qnx/qnx6.1/ctype_inline.h index 871a38d..c6c7a1f 100644 --- a/libstdc++-v3/config/os/qnx/qnx6.1/ctype_inline.h +++ b/libstdc++-v3/config/os/qnx/qnx6.1/ctype_inline.h @@ -30,10 +30,10 @@ // // ISO C++ 14882: 22.1 Locales // - + // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/os/solaris/solaris2.10/ctype_base.h b/libstdc++-v3/config/os/solaris/solaris2.10/ctype_base.h index 9a9added..470d9da 100644 --- a/libstdc++-v3/config/os/solaris/solaris2.10/ctype_base.h +++ b/libstdc++-v3/config/os/solaris/solaris2.10/ctype_base.h @@ -25,7 +25,7 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from /usr/include/ctype.h. Looks like this // only works with solaris2.7 and solaris2.8. Thanks for not changing // things, sun engineers! @@ -42,7 +42,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 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; + typedef unsigned int mask; static const mask upper = _ISUPPER; static const mask lower = _ISLOWER; static const mask alpha = _ISALPHA; diff --git a/libstdc++-v3/config/os/solaris/solaris2.10/ctype_configure_char.cc b/libstdc++-v3/config/os/solaris/solaris2.10/ctype_configure_char.cc index 01f2883..148b9f6 100644 --- a/libstdc++-v3/config/os/solaris/solaris2.10/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/solaris/solaris2.10/ctype_configure_char.cc @@ -37,17 +37,17 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION // Information as gleaned from /usr/include/ctype.h - - const ctype_base::mask* + + const ctype_base::mask* ctype<char>::classic_table() throw() { return __ctype_mask; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), + : facet(__refs), _M_del(__table != 0 && __del), _M_toupper(__trans_upper), _M_tolower(__trans_lower), - _M_table(__table ? __table : classic_table()) - { + _M_table(__table ? __table : classic_table()) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -55,10 +55,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), + : facet(__refs), _M_del(__table != 0 && __del), _M_toupper(__trans_upper), _M_tolower(__trans_lower), - _M_table(__table ? __table : classic_table()) - { + _M_table(__table ? __table : classic_table()) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return _M_tolower[static_cast<unsigned char>(__c)]; } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/solaris/solaris2.10/ctype_inline.h b/libstdc++-v3/config/os/solaris/solaris2.10/ctype_inline.h index 54f817b..e62f5f3 100644 --- a/libstdc++-v3/config/os/solaris/solaris2.10/ctype_inline.h +++ b/libstdc++-v3/config/os/solaris/solaris2.10/ctype_inline.h @@ -21,7 +21,7 @@ // a copy of the GCC Runtime Library Exception along with this program; // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // <http://www.gnu.org/licenses/>. - + /** @file bits/ctype_inline.h * This is an internal header file, included by other library headers. * Do not attempt to use it directly. @headername{locale} @@ -33,7 +33,7 @@ // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_is(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && !(_M_table[static_cast<unsigned char>(*__low)] & __m)) ++__low; return __low; @@ -66,7 +66,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_not(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0) ++__low; return __low; diff --git a/libstdc++-v3/config/os/tpf/ctype_base.h b/libstdc++-v3/config/os/tpf/ctype_base.h index 10565f8..8e5be5f 100644 --- a/libstdc++-v3/config/os/tpf/ctype_base.h +++ b/libstdc++-v3/config/os/tpf/ctype_base.h @@ -25,9 +25,9 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from /usr/include/ctype.h - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -40,7 +40,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 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 short mask; + typedef unsigned short mask; static const mask upper = _ISupper; static const mask lower = _ISlower; static const mask alpha = _ISalpha; diff --git a/libstdc++-v3/config/os/tpf/ctype_configure_char.cc b/libstdc++-v3/config/os/tpf/ctype_configure_char.cc index 75b2f9d..7dc9569 100644 --- a/libstdc++-v3/config/os/tpf/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/tpf/ctype_configure_char.cc @@ -53,8 +53,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __ret; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) : facet(__refs), _M_del(__table != 0 && __del) { char* __old = setlocale(LC_CTYPE, NULL); @@ -105,7 +105,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return _M_tolower[static_cast<unsigned char>(__c)]; } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/tpf/ctype_inline.h b/libstdc++-v3/config/os/tpf/ctype_inline.h index be320d9..6621715 100644 --- a/libstdc++-v3/config/os/tpf/ctype_inline.h +++ b/libstdc++-v3/config/os/tpf/ctype_inline.h @@ -30,10 +30,10 @@ // // ISO C++ 14882: 22.1 Locales // - + // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) // functions go in ctype.cc - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_is(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && !(_M_table[static_cast<unsigned char>(*__low)] & __m)) ++__low; return __low; @@ -66,7 +66,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_not(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0) ++__low; return __low; diff --git a/libstdc++-v3/config/os/uclibc/ctype_configure_char.cc b/libstdc++-v3/config/os/uclibc/ctype_configure_char.cc index eefb400..c712a702 100644 --- a/libstdc++-v3/config/os/uclibc/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/uclibc/ctype_configure_char.cc @@ -42,9 +42,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::classic_table() throw() { return __C_ctype_b; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0) { _M_toupper = __C_ctype_toupper; @@ -55,7 +55,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0) { _M_toupper = __C_ctype_toupper; @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return _M_tolower[static_cast<unsigned char>(__c)]; } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/vxworks/ctype_base.h b/libstdc++-v3/config/os/vxworks/ctype_base.h index 5dcc926..d965645 100644 --- a/libstdc++-v3/config/os/vxworks/ctype_base.h +++ b/libstdc++-v3/config/os/vxworks/ctype_base.h @@ -25,9 +25,9 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information extracted from target/h/ctype.h. - + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -40,7 +40,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 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 char mask; + typedef unsigned char mask; static const mask upper = _C_UPPER; static const mask lower = _C_LOWER; static const mask alpha = _C_UPPER | _C_LOWER; diff --git a/libstdc++-v3/config/os/vxworks/ctype_configure_char.cc b/libstdc++-v3/config/os/vxworks/ctype_configure_char.cc index 17b7de4..dc0f7b0 100644 --- a/libstdc++-v3/config/os/vxworks/ctype_configure_char.cc +++ b/libstdc++-v3/config/os/vxworks/ctype_configure_char.cc @@ -42,23 +42,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::classic_table() throw() { return __ctype; } - ctype<char>::ctype(__c_locale, const mask* __table, bool __del, - size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_table(__table ? __table : classic_table()) - { + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); _M_narrow_ok = 0; } - ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) - : facet(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : classic_table()) - { + { memset(_M_widen, 0, sizeof(_M_widen)); _M_widen_ok = 0; memset(_M_narrow, 0, sizeof(_M_narrow)); @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>::do_tolower(char __c) const { return __tolower(__c); } - const char* + const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) diff --git a/libstdc++-v3/config/os/vxworks/ctype_inline.h b/libstdc++-v3/config/os/vxworks/ctype_inline.h index 9c59666..49a4c19 100644 --- a/libstdc++-v3/config/os/vxworks/ctype_inline.h +++ b/libstdc++-v3/config/os/vxworks/ctype_inline.h @@ -30,7 +30,7 @@ // // ISO C++ 14882: 22.1 Locales // - + // Information as gleaned from target/h/ctype.h // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) @@ -58,7 +58,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<char>:: scan_is(mask __m, const char* __low, const char* __high) const { - while (__low < __high + while (__low < __high && !(__ctype[static_cast<unsigned char>(*__low)] & __m)) ++__low; return __low; |