diff options
| author | Chris Gregory <czipperz@gmail.com> | 2016-04-29 16:11:43 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2016-04-29 16:11:43 +0000 |
| commit | 9a1a9dff43657d759efe9d6cecf030edfe74b59d (patch) | |
| tree | 6fc3bcf79e417c6b1b8b408b428be97042699596 /libstdc++-v3/config | |
| parent | 740c0b9bb29e3caf34b46768fb28f6b344af4331 (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@235645 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config')
77 files changed, 539 insertions, 539 deletions
diff --git a/libstdc++-v3/config/abi/compatibility.h b/libstdc++-v3/config/abi/compatibility.h index 96a7379075f..d1c37bde97c 100644 --- a/libstdc++-v3/config/abi/compatibility.h +++ b/libstdc++-v3/config/abi/compatibility.h @@ -28,7 +28,7 @@ */ // Switch for symbol version macro. -#ifndef _GLIBCXX_APPLY_SYMVER +#ifndef _GLIBCXX_APPLY_SYMVER #error must define _GLIBCXX_APPLY_SYMVER before including __FILE__ #endif @@ -36,7 +36,7 @@ _ZNSt19istreambuf_iteratorIcSt11char_traitsIcEEppEv _ZNSt19istreambuf_iteratorIwSt11char_traitsIwEEppEv */ -namespace +namespace { _GLIBCXX_APPLY_SYMVER(_ZNSt21istreambuf_iteratorXXIcSt11char_traitsIcEEppEv, _ZNSt19istreambuf_iteratorIcSt11char_traitsIcEEppEv) @@ -76,7 +76,7 @@ _ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreEv _ZNSt11char_traitsIcE2eqERKcS2_ _ZNSt11char_traitsIwE2eqERKwS2_ */ -namespace +namespace { _GLIBCXX_APPLY_SYMVER(_ZNSt11char_traitsIcE4eqXXERKcS2_, _ZNSt11char_traitsIcE2eqERKcS2_) diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver index dec048322ce..8304dee089c 100644 --- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver +++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver @@ -77,7 +77,7 @@ GLIBCXX_7.0 { # locale _ZNSt3__79has_facetINS_*; - # hash + # hash _ZNSt8__detail3__712__prime_listE; _ZNSt3tr18__detail3__712__prime_listE; @@ -110,7 +110,7 @@ GLIBCXX_7.0 { _ZN9__gnu_cxx3__76__poolILb[01]EE10_M_destroyEv; _ZN9__gnu_cxx3__76__poolILb1EE16_M_get_thread_idEv; - _ZN9__gnu_cxx3__717__pool_alloc_base9_M_refillE[jmy]; + _ZN9__gnu_cxx3__717__pool_alloc_base9_M_refillE[jmy]; _ZN9__gnu_cxx3__717__pool_alloc_base16_M_get_free_listE[jmy]; _ZN9__gnu_cxx3__717__pool_alloc_base12_M_get_mutexEv; diff --git a/libstdc++-v3/config/abi/pre/none.ver b/libstdc++-v3/config/abi/pre/none.ver index 39cb10d4dbf..91287008c39 100644 --- a/libstdc++-v3/config/abi/pre/none.ver +++ b/libstdc++-v3/config/abi/pre/none.ver @@ -1,6 +1,6 @@ -# +# # This is a placeholder file. It does nothing and is not used. -# +# # If you are seeing this file as your linker script (named # libstdc++-symbols.ver), then either 1) the configuration process # determined that symbol versioning should not be done, or 2) you diff --git a/libstdc++-v3/config/cpu/arm/cxxabi_tweaks.h b/libstdc++-v3/config/cpu/arm/cxxabi_tweaks.h index 6876631cd6b..177590c8929 100644 --- a/libstdc++-v3/config/cpu/arm/cxxabi_tweaks.h +++ b/libstdc++-v3/config/cpu/arm/cxxabi_tweaks.h @@ -33,7 +33,7 @@ #ifdef __cplusplus namespace __cxxabiv1 { - extern "C" + extern "C" { #endif @@ -49,7 +49,7 @@ namespace __cxxabiv1 // We also want the element size in array cookies. #define _GLIBCXX_ELTSIZE_IN_COOKIE 1 - + // __cxa_vec_ctor should return a pointer to the array. typedef void * __cxa_vec_ctor_return_type; #define _GLIBCXX_CXA_VEC_CTOR_RETURN(x) return x @@ -79,4 +79,4 @@ namespace __cxxabiv1 } // namespace __cxxabiv1 #endif -#endif +#endif diff --git a/libstdc++-v3/config/cpu/cris/atomic_word.h b/libstdc++-v3/config/cpu/cris/atomic_word.h index fa2628f69cf..3536d845cc3 100644 --- a/libstdc++-v3/config/cpu/cris/atomic_word.h +++ b/libstdc++-v3/config/cpu/cris/atomic_word.h @@ -28,4 +28,4 @@ // This entity must not cross a page boundary. typedef int _Atomic_word __attribute__ ((__aligned__ (4))); -#endif +#endif diff --git a/libstdc++-v3/config/cpu/generic/atomic_word.h b/libstdc++-v3/config/cpu/generic/atomic_word.h index 53c5c869234..e3f015ea989 100644 --- a/libstdc++-v3/config/cpu/generic/atomic_word.h +++ b/libstdc++-v3/config/cpu/generic/atomic_word.h @@ -37,4 +37,4 @@ typedef int _Atomic_word; // This is a memory order release fence. #define _GLIBCXX_WRITE_MEM_BARRIER __atomic_thread_fence (__ATOMIC_RELEASE) -#endif +#endif diff --git a/libstdc++-v3/config/cpu/generic/atomicity_builtins/atomicity.h b/libstdc++-v3/config/cpu/generic/atomicity_builtins/atomicity.h index 7472ace67fb..9b7431bebd7 100644 --- a/libstdc++-v3/config/cpu/generic/atomicity_builtins/atomicity.h +++ b/libstdc++-v3/config/cpu/generic/atomicity_builtins/atomicity.h @@ -30,7 +30,7 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - _Atomic_word + _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () { return __atomic_fetch_add(__mem, __val, __ATOMIC_ACQ_REL); } diff --git a/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h b/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h index d3a7becf7c9..be128722473 100644 --- a/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h +++ b/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h @@ -25,7 +25,7 @@ #include <ext/atomicity.h> #include <ext/concurrence.h> -namespace +namespace { __gnu_cxx::__mutex& get_atomic_mutex() diff --git a/libstdc++-v3/config/cpu/generic/cxxabi_tweaks.h b/libstdc++-v3/config/cpu/generic/cxxabi_tweaks.h index 6511219a576..16e9237b42a 100644 --- a/libstdc++-v3/config/cpu/generic/cxxabi_tweaks.h +++ b/libstdc++-v3/config/cpu/generic/cxxabi_tweaks.h @@ -33,7 +33,7 @@ #ifdef __cplusplus namespace __cxxabiv1 { - extern "C" + extern "C" { #endif @@ -56,4 +56,4 @@ namespace __cxxabiv1 } // namespace __cxxabiv1 #endif -#endif +#endif diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h index 8b18c60efb9..364715b7f97 100644 --- a/libstdc++-v3/config/cpu/hppa/atomicity.h +++ b/libstdc++-v3/config/cpu/hppa/atomicity.h @@ -34,7 +34,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static volatile int _S_atomicity_lock; }; - + template<int _Inst> volatile int _Atomicity_lock<_Inst>::_S_atomicity_lock __attribute__ ((aligned (16))) = 1; @@ -50,7 +50,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Atomic_word result; int tmp; volatile int& lock = _Atomicity_lock<0>::_S_atomicity_lock; - + __asm__ __volatile__ ("ldcw 0(%1),%0\n\t" "cmpib,<>,n 0,%0,.+20\n\t" "ldw 0(%1),%0\n\t" @@ -60,21 +60,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : "=&r" (tmp) : "r" (&lock) : "memory"); - + result = *__mem; *__mem = result + __val; __asm__ __volatile__ ("stw %1,0(%0)" : : "r" (&lock), "r" (tmp) : "memory"); return result; } - + void __attribute__ ((__unused__)) __atomic_add(volatile _Atomic_word* __mem, int __val) throw () { int tmp; volatile int& lock = _Atomicity_lock<0>::_S_atomicity_lock; - + __asm__ __volatile__ ("ldcw 0(%1),%0\n\t" "cmpib,<>,n 0,%0,.+20\n\t" "ldw 0(%1),%0\n\t" @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : "=&r" (tmp) : "r" (&lock) : "memory"); - + *__mem += __val; __asm__ __volatile__ ("stw %1,0(%0)" : : "r" (&lock), "r" (tmp) : "memory"); diff --git a/libstdc++-v3/config/cpu/i386/atomicity.h b/libstdc++-v3/config/cpu/i386/atomicity.h index a334b295a6e..35818f51923 100644 --- a/libstdc++-v3/config/cpu/i386/atomicity.h +++ b/libstdc++-v3/config/cpu/i386/atomicity.h @@ -38,32 +38,32 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION volatile _Atomic_word _Atomicity_lock<__inst>::_S_atomicity_lock = 0; template volatile _Atomic_word _Atomicity_lock<0>::_S_atomicity_lock; - - _Atomic_word + + _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () { register _Atomic_word __result, __tmp = 1; - + // Obtain the atomic exchange/add spin lock. - do + do { __asm__ __volatile__ ("xchg{l} {%0,%1|%1,%0}" : "=m" (_Atomicity_lock<0>::_S_atomicity_lock), "+r" (__tmp) : "m" (_Atomicity_lock<0>::_S_atomicity_lock)); - } + } while (__tmp); - + __result = *__mem; *__mem += __val; - + // Release spin lock. _Atomicity_lock<0>::_S_atomicity_lock = 0; - + return __result; } - + void __attribute__ ((__unused__)) __atomic_add(volatile _Atomic_word* __mem, int __val) throw () diff --git a/libstdc++-v3/config/cpu/i486/atomicity.h b/libstdc++-v3/config/cpu/i486/atomicity.h index ce5202f70f4..6068d9b40bf 100644 --- a/libstdc++-v3/config/cpu/i486/atomicity.h +++ b/libstdc++-v3/config/cpu/i486/atomicity.h @@ -28,17 +28,17 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - _Atomic_word + _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () { register _Atomic_word __result; __asm__ __volatile__ ("lock; xadd{l} {%0,%1|%1,%0}" - : "=r" (__result), "=m" (*__mem) + : "=r" (__result), "=m" (*__mem) : "0" (__val), "m" (*__mem)); return __result; } - + void __attribute__ ((__unused__)) __atomic_add(volatile _Atomic_word* __mem, int __val) throw () diff --git a/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h b/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h index 24a42e45dcf..e5dfbb9b2a0 100644 --- a/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h +++ b/libstdc++-v3/config/cpu/i486/opt/bits/opt_random.h @@ -170,7 +170,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } while (__v2 > __maskval || __v2 < __tmp); - + __v.__i = _mm_set_epi64x(__v1, __v2); } diff --git a/libstdc++-v3/config/cpu/m68k/atomicity.h b/libstdc++-v3/config/cpu/m68k/atomicity.h index 6e567510477..f4213302424 100644 --- a/libstdc++-v3/config/cpu/m68k/atomicity.h +++ b/libstdc++-v3/config/cpu/m68k/atomicity.h @@ -32,7 +32,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION || defined(__mc68040__) || defined(__mc68060__) ) \ && !defined(__mcpu32__) // These variants support compare-and-swap. - _Atomic_word + _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () { @@ -58,16 +58,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION short __level, __tmpsr; __asm__ __volatile__ ("move%.w %%sr,%0\n\tor%.l %0,%1\n\tmove%.w %1,%%sr" : "=d"(__level), "=d"(__tmpsr) : "1"(0x700)); - + __result = *__mem; - *__mem = __result + __val; + *__mem = __result + __val; __asm__ __volatile__ ("move%.w %0,%%sr" : : "d"(__level)); - + return __result; } #else - + template<int __inst> struct _Atomicity_lock { @@ -76,29 +76,29 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<int __inst> volatile unsigned char _Atomicity_lock<__inst>::_S_atomicity_lock = 0; - + template volatile unsigned char _Atomicity_lock<0>::_S_atomicity_lock; - - _Atomic_word + + _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () { _Atomic_word __result; - + // bset with no immediate addressing (not SMP-safe) #if defined(__mcfisaa__) || defined(__mcfisaaplus__) __asm__ __volatile__("1: bset.b #7,%0@\n\tjbne 1b" : /* no outputs */ : "a"(&_Atomicity_lock<0>::_S_atomicity_lock) : "cc", "memory"); - + // CPU32 and CF ISAs B & C support test-and-set (SMP-safe). #elif defined(__mcpu32__) || defined(__mcfisab__) || defined (__mcfisac__) __asm__ __volatile__("1: tas %0\n\tjbne 1b" : "+m"(_Atomicity_lock<0>::_S_atomicity_lock) : /* none */ : "cc"); - + // Use bset with immediate addressing for 68000/68010 (not SMP-safe) // NOTE: TAS is available on the 68000, but unsupported by some Amiga // memory controllers. @@ -108,15 +108,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : /* none */ : "cc"); #endif - + __result = *__mem; *__mem = __result + __val; - + _Atomicity_lock<0>::_S_atomicity_lock = 0; - + return __result; } - + #endif /* TAS / BSET */ void diff --git a/libstdc++-v3/config/cpu/sparc/atomic_word.h b/libstdc++-v3/config/cpu/sparc/atomic_word.h index b9eec045b42..19211cacc4b 100644 --- a/libstdc++-v3/config/cpu/sparc/atomic_word.h +++ b/libstdc++-v3/config/cpu/sparc/atomic_word.h @@ -45,4 +45,4 @@ #endif -#endif +#endif diff --git a/libstdc++-v3/config/cpu/sparc/atomicity.h b/libstdc++-v3/config/cpu/sparc/atomicity.h index a6f615f178f..01bef57ceb2 100644 --- a/libstdc++-v3/config/cpu/sparc/atomicity.h +++ b/libstdc++-v3/config/cpu/sparc/atomicity.h @@ -46,14 +46,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : "r" (__mem), "r" (__val_extended), "m" (*__mem)); return __tmp2; } - + void __attribute__ ((__unused__)) __atomic_add(volatile _Atomic_word* __mem, int __val) throw () { _Atomic_word __tmp1, __tmp2; _Atomic_word __val_extended = __val; - + __asm__ __volatile__("1: ldx [%3], %0\n\t" " add %0, %4, %1\n\t" " casx [%3], %0, %1\n\t" @@ -63,7 +63,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : "=&r" (__tmp1), "=&r" (__tmp2), "=m" (*__mem) : "r" (__mem), "r" (__val_extended), "m" (*__mem)); } - + #else /* __arch32__ */ template<int __inst> @@ -74,15 +74,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<int __inst> unsigned char _Atomicity_lock<__inst>::_S_atomicity_lock = 0; - + template unsigned char _Atomicity_lock<0>::_S_atomicity_lock; - + _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () { _Atomic_word __result, __tmp; - + __asm__ __volatile__("1: ldstub [%1], %0\n\t" " cmp %0, 0\n\t" " bne 1b\n\t" @@ -98,13 +98,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : "memory"); return __result; } - + void __attribute__ ((__unused__)) __atomic_add(volatile _Atomic_word* __mem, int __val) throw () { _Atomic_word __tmp; - + __asm__ __volatile__("1: ldstub [%1], %0\n\t" " cmp %0, 0\n\t" " bne 1b\n\t" @@ -117,7 +117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : /* no outputs */ : "r" (&_Atomicity_lock<0>::_S_atomicity_lock) : "memory"); - } + } #endif /* __arch32__ */ _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc index 40f4b576d3f..1349dc75f89 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc @@ -41,7 +41,7 @@ // Pick up FIONREAD on Solaris 2 #ifdef _GLIBCXX_HAVE_SYS_IOCTL_H -#define BSD_COMP +#define BSD_COMP #include <sys/ioctl.h> #endif @@ -65,14 +65,14 @@ #include <limits> // For <off_t>::max() and min() and <streamsize>::max() -namespace +namespace { // Map ios_base::openmode flags to a string for use in fopen(). // Table of valid combinations as given in [lib.filebuf.members]/2. static const char* fopen_mode(std::ios_base::openmode mode) { - enum + enum { in = std::ios_base::in, out = std::ios_base::out, @@ -167,7 +167,7 @@ namespace __nleft -= xwrite(__fd, __s2 + __off, __n2 - __off); break; } - + __s1 += __ret; __n1_left -= __ret; } @@ -188,15 +188,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __basic_file<char>::~__basic_file() { this->close(); } - + __basic_file<char>* - __basic_file<char>::sys_open(__c_file* __file, ios_base::openmode) + __basic_file<char>::sys_open(__c_file* __file, ios_base::openmode) { __basic_file* __ret = NULL; if (!this->is_open() && __file) { int __err; - errno = 0; + errno = 0; do __err = this->sync(); while (__err && errno == EINTR); @@ -209,7 +209,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - + __basic_file<char>* __basic_file<char>::sys_open(int __fd, ios_base::openmode __mode) throw () { @@ -225,9 +225,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - - __basic_file<char>* - __basic_file<char>::open(const char* __name, ios_base::openmode __mode, + + __basic_file<char>* + __basic_file<char>::open(const char* __name, ios_base::openmode __mode, int /*__prot*/) { __basic_file* __ret = NULL; @@ -246,22 +246,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - - bool + + bool __basic_file<char>::is_open() const throw () { return _M_cfile != 0; } - - int + + int __basic_file<char>::fd() throw () { return fileno(_M_cfile); } - + __c_file* __basic_file<char>::file() throw () { return _M_cfile; } - - __basic_file<char>* + + __basic_file<char>* __basic_file<char>::close() - { + { __basic_file* __ret = static_cast<__basic_file*>(NULL); if (this->is_open()) { @@ -283,8 +283,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - - streamsize + + streamsize __basic_file<char>::xsgetn(char* __s, streamsize __n) { streamsize __ret; @@ -294,11 +294,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __ret; } - streamsize + streamsize __basic_file<char>::xsputn(const char* __s, streamsize __n) { return xwrite(this->fd(), __s, __n); } - streamsize + streamsize __basic_file<char>::xsputn_2(const char* __s1, streamsize __n1, const char* __s2, streamsize __n2) { @@ -328,8 +328,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif } - int - __basic_file<char>::sync() + int + __basic_file<char>::sync() { return fflush(_M_cfile); } streamsize @@ -337,11 +337,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { #ifndef _GLIBCXX_NO_IOCTL #ifdef FIONREAD - // Pipes and sockets. + // Pipes and sockets. int __num = 0; int __r = ioctl(this->fd(), FIONREAD, &__num); if (!__r && __num >= 0) - return __num; + return __num; #endif #endif @@ -352,7 +352,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __pfd[0].events = POLLIN; if (poll(__pfd, 1, 0) <= 0) return 0; -#endif +#endif #if defined(_GLIBCXX_HAVE_S_ISREG) || defined(_GLIBCXX_HAVE_S_IFREG) // Regular files. diff --git a/libstdc++-v3/config/io/basic_file_stdio.h b/libstdc++-v3/config/io/basic_file_stdio.h index 319591ecc9f..47ae9e8ae49 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.h +++ b/libstdc++-v3/config/io/basic_file_stdio.h @@ -47,7 +47,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Generic declaration. template<typename _CharT> - class __basic_file; + class __basic_file; // Specialization. template<> @@ -81,7 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif - __basic_file* + __basic_file* open(const char* __name, ios_base::openmode __mode, int __prot = 0664); __basic_file* @@ -90,13 +90,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __basic_file* sys_open(int __fd, ios_base::openmode __mode) throw (); - __basic_file* - close(); + __basic_file* + close(); - _GLIBCXX_PURE bool + _GLIBCXX_PURE bool is_open() const throw (); - _GLIBCXX_PURE int + _GLIBCXX_PURE int fd() throw (); _GLIBCXX_PURE __c_file* @@ -104,20 +104,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ~__basic_file(); - streamsize + streamsize xsputn(const char* __s, streamsize __n); - streamsize + streamsize xsputn_2(const char* __s1, streamsize __n1, const char* __s2, streamsize __n2); - streamsize + streamsize xsgetn(char* __s, streamsize __n); streamoff seekoff(streamoff __off, ios_base::seekdir __way) throw (); - int + int sync(); streamsize @@ -127,4 +127,4 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#endif +#endif diff --git a/libstdc++-v3/config/locale/darwin/ctype_members.cc b/libstdc++-v3/config/locale/darwin/ctype_members.cc index 7ff02369e76..5fa78b3d721 100644 --- a/libstdc++-v3/config/locale/darwin/ctype_members.cc +++ b/libstdc++-v3/config/locale/darwin/ctype_members.cc @@ -40,19 +40,19 @@ namespace std _GLIBCXX_VISIBILITY(default) // various /config/os/* files. ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) - : ctype<char>(0, false, __refs) - { + : ctype<char>(0, false, __refs) + { if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_ctype); - this->_S_create_c_locale(this->_M_c_locale_ctype, __s); + this->_S_create_c_locale(this->_M_c_locale_ctype, __s); } } ctype_byname<char>::~ctype_byname() { } -#ifdef _GLIBCXX_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T ctype<wchar_t>::__wmask_type ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const throw() { @@ -60,7 +60,7 @@ namespace std _GLIBCXX_VISIBILITY(default) // never gets called. return __m; }; - + wchar_t ctype<wchar_t>::do_toupper(wchar_t __c) const { return towupper(__c); } @@ -75,11 +75,11 @@ namespace std _GLIBCXX_VISIBILITY(default) } return __hi; } - + wchar_t ctype<wchar_t>::do_tolower(wchar_t __c) const { return towlower(__c); } - + const wchar_t* ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const { @@ -96,7 +96,7 @@ namespace std _GLIBCXX_VISIBILITY(default) do_widen(char __c) const { return _M_widen[static_cast<unsigned char>(__c)]; } - const char* + const char* ctype<wchar_t>:: do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const { @@ -112,16 +112,16 @@ namespace std _GLIBCXX_VISIBILITY(default) char ctype<wchar_t>:: do_narrow(wchar_t __wc, char __dfault) const - { + { if (__wc >= 0 && __wc < 128 && _M_narrow_ok) return _M_narrow[__wc]; const int __c = wctob(__wc); - return (__c == EOF ? __dfault : static_cast<char>(__c)); + return (__c == EOF ? __dfault : static_cast<char>(__c)); } const wchar_t* ctype<wchar_t>:: - do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, + do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, char* __dest) const { if (_M_narrow_ok) diff --git a/libstdc++-v3/config/locale/dragonfly/codecvt_members.cc b/libstdc++-v3/config/locale/dragonfly/codecvt_members.cc index af10148bc39..42698a90c00 100644 --- a/libstdc++-v3/config/locale/dragonfly/codecvt_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/codecvt_members.cc @@ -42,7 +42,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_USE_WCHAR_T codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_out(state_type& __state, const intern_type* __from, + do_out(state_type& __state, const intern_type* __from, const intern_type* __from_end, const intern_type*& __from_next, extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const @@ -108,12 +108,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION uselocale((locale_t)__old); - return __ret; + return __ret; } - + codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_in(state_type& __state, const extern_type* __from, + do_in(state_type& __state, const extern_type* __from, const extern_type* __from_end, const extern_type*& __from_next, intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const @@ -155,12 +155,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION break; } __from_next = __from; - __state = __tmp_state; + __state = __tmp_state; __ret = error; } else if (__from_next && __from_next < __from_chunk_end) { - // It is unclear what to return in this case (see DR 382). + // It is unclear what to return in this case (see DR 382). __to_next += __conv; __ret = partial; } @@ -175,7 +175,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__to_next < __to_end) { // XXX Probably wrong for stateful encodings - __tmp_state = __state; + __tmp_state = __state; ++__from_next; *__to_next++ = L'\0'; } @@ -186,10 +186,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION uselocale((locale_t)__old); - return __ret; + return __ret; } - int + int codecvt<wchar_t, char, mbstate_t>:: do_encoding() const throw() { @@ -201,9 +201,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ret = 1; uselocale((locale_t)__old); return __ret; - } + } - int + int codecvt<wchar_t, char, mbstate_t>:: do_max_length() const throw() { @@ -213,8 +213,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION uselocale((locale_t)__old); return __ret; } - - int + + int codecvt<wchar_t, char, mbstate_t>:: do_length(state_type& __state, const extern_type* __from, const extern_type* __end, size_t __max) const @@ -227,10 +227,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // mbsnrtowcs is *very* fast but stops if encounters NUL characters: // in case we advance past it and then continue, in a loop. // NB: mbsnrtowcs is a GNU extension - + // A dummy internal buffer is needed in order for mbsnrtocws to consider // its fourth parameter (it wouldn't with NULL as first parameter). - wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) + wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) * __max)); while (__from < __end && __max) { @@ -264,7 +264,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } if (!__from) __from = __from_chunk_end; - + __ret += __from - __tmp_from; __max -= __conv; @@ -280,7 +280,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION uselocale((locale_t)__old); - return __ret; + return __ret; } #endif diff --git a/libstdc++-v3/config/locale/dragonfly/collate_members.cc b/libstdc++-v3/config/locale/dragonfly/collate_members.cc index 31997a43b4f..979f501a0f8 100644 --- a/libstdc++-v3/config/locale/dragonfly/collate_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/collate_members.cc @@ -39,30 +39,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // These are basically extensions to char_traits, and perhaps should // be put there instead of here. template<> - int - collate<char>::_M_compare(const char* __one, + int + collate<char>::_M_compare(const char* __one, const char* __two) const throw() - { + { int __cmp = strcoll_l(__one, __two, (locale_t)_M_c_locale_collate); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t - collate<char>::_M_transform(char* __to, const char* __from, + collate<char>::_M_transform(char* __to, const char* __from, size_t __n) const throw() { return strxfrm_l(__to, __from, __n, (locale_t)_M_c_locale_collate); } #ifdef _GLIBCXX_USE_WCHAR_T template<> - int - collate<wchar_t>::_M_compare(const wchar_t* __one, + int + collate<wchar_t>::_M_compare(const wchar_t* __one, const wchar_t* __two) const throw() { int __cmp = wcscoll_l(__one, __two, (locale_t)_M_c_locale_collate); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from, diff --git a/libstdc++-v3/config/locale/dragonfly/ctype_members.cc b/libstdc++-v3/config/locale/dragonfly/ctype_members.cc index c99a61f0e76..fbe220d7829 100644 --- a/libstdc++-v3/config/locale/dragonfly/ctype_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/ctype_members.cc @@ -44,19 +44,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // NB: The other ctype<char> specializations are in src/locale.cc and // various /config/os/* files. ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) - : ctype<char>(0, false, __refs) - { + : ctype<char>(0, false, __refs) + { if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_ctype); - this->_S_create_c_locale(this->_M_c_locale_ctype, __s); + this->_S_create_c_locale(this->_M_c_locale_ctype, __s); } } ctype_byname<char>::~ctype_byname() { } -#ifdef _GLIBCXX_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T ctype<wchar_t>::__wmask_type ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const throw() { @@ -104,7 +104,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - + wchar_t ctype<wchar_t>::do_toupper(wchar_t __c) const { return towupper_l(__c, (locale_t)_M_c_locale_ctype); } @@ -119,11 +119,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - + wchar_t ctype<wchar_t>::do_tolower(wchar_t __c) const { return towlower_l(__c, (locale_t)_M_c_locale_ctype); } - + const wchar_t* ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const { @@ -140,7 +140,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION do_widen(char __c) const { return _M_widen[static_cast<unsigned char>(__c)]; } - const char* + const char* ctype<wchar_t>:: do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const { @@ -162,12 +162,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __c_locale __old = (__c_locale)uselocale((locale_t)_M_c_locale_ctype); const int __c = wctob(__wc); uselocale((locale_t)__old); - return (__c == EOF ? __dfault : static_cast<char>(__c)); + return (__c == EOF ? __dfault : static_cast<char>(__c)); } const wchar_t* ctype<wchar_t>:: - do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, + do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, char* __dest) const { __c_locale __old = (__c_locale)uselocale((locale_t)_M_c_locale_ctype); diff --git a/libstdc++-v3/config/locale/dragonfly/monetary_members.cc b/libstdc++-v3/config/locale/dragonfly/monetary_members.cc index e463de10fac..f9a04fbba7e 100644 --- a/libstdc++-v3/config/locale/dragonfly/monetary_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/monetary_members.cc @@ -44,9 +44,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Construct and return valid pattern consisting of some combination of: // space none symbol sign value money_base::pattern - money_base::_S_construct_pattern(char __precedes, char __space, + money_base::_S_construct_pattern(char __precedes, char __space, char __posn) throw() - { + { pattern __ret; // This insanely complicated routine attempts to construct a valid @@ -54,7 +54,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // if (__precedes) symbol -> value // else value -> symbol - + // if (__space) space // else none @@ -139,7 +139,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__precedes) { __ret.field[0] = sign; - __ret.field[1] = symbol; + __ret.field[1] = symbol; if (__space) { __ret.field[2] = space; @@ -147,7 +147,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else { - __ret.field[2] = value; + __ret.field[2] = value; __ret.field[3] = none; } } @@ -211,7 +211,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void - moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, + moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, const char*) { if (!_M_data) @@ -270,7 +270,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __try { size_t __len; - + // Check for NULL, which implies no grouping. if (lc->mon_thousands_sep == NULL || lc->mon_thousands_sep[0] == '\0') @@ -365,7 +365,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void - moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, + moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, const char*) { if (!_M_data) @@ -550,7 +550,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_USE_WCHAR_T template<> void - moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, + moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, const char*) { if (!_M_data) @@ -652,9 +652,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_positive_sign = L""; - _M_data->_M_positive_sign_size = + _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); - + __len = strlen(__cnegsign); if (!__nposn) _M_data->_M_negative_sign = L"()"; @@ -667,9 +667,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_negative_sign = L""; - _M_data->_M_negative_sign_size = + _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); - + // _Intl == true. __len = strlen(__ccurr); if (__len) @@ -689,11 +689,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data = 0; delete [] __group; delete [] __wcs_ps; - delete [] __wcs_ns; + delete [] __wcs_ns; uselocale((locale_t)__old); __throw_exception_again; - } - + } + char __pprecedes = lc->int_p_cs_precedes; char __pspace = lc->int_p_sep_by_space; char __pposn = lc->int_p_sign_posn; @@ -812,7 +812,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_positive_sign = L""; - _M_data->_M_positive_sign_size = + _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); __len = strlen(__cnegsign); @@ -827,7 +827,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_negative_sign = L""; - _M_data->_M_negative_sign_size = + _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); // _Intl == true. @@ -849,7 +849,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data = 0; delete [] __group; delete [] __wcs_ps; - delete [] __wcs_ns; + delete [] __wcs_ns; uselocale((locale_t)__old); __throw_exception_again; } diff --git a/libstdc++-v3/config/locale/dragonfly/numeric_members.cc b/libstdc++-v3/config/locale/dragonfly/numeric_members.cc index eb05fc32369..29c9fc9202a 100644 --- a/libstdc++-v3/config/locale/dragonfly/numeric_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/numeric_members.cc @@ -37,7 +37,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - template<> + template<> void numpunct<char>::_M_initialize_numpunct(__c_locale __cloc) { @@ -123,17 +123,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename = "false"; _M_data->_M_falsename_size = 5; } - - template<> + + template<> numpunct<char>::~numpunct() { if (_M_data->_M_grouping_size) delete [] _M_data->_M_grouping; delete _M_data; } - + #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc) { @@ -222,7 +222,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename_size = 5; } - template<> + template<> numpunct<wchar_t>::~numpunct() { if (_M_data->_M_grouping_size) diff --git a/libstdc++-v3/config/locale/dragonfly/time_members.cc b/libstdc++-v3/config/locale/dragonfly/time_members.cc index 9a9c64031e4..c1a1f3d5b4c 100644 --- a/libstdc++-v3/config/locale/dragonfly/time_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/time_members.cc @@ -44,7 +44,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void __timepunct<char>:: - _M_put(char* __s, size_t __maxlen, const char* __format, + _M_put(char* __s, size_t __maxlen, const char* __format, const tm* __tm) const throw() { const size_t __len = strftime_l(__s, __maxlen, __format, __tm, @@ -54,7 +54,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __s[0] = '\0'; } - template<> + template<> void __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc) { @@ -124,7 +124,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else { - _M_c_locale_timepunct = _S_clone_c_locale(__cloc); + _M_c_locale_timepunct = _S_clone_c_locale(__cloc); _M_data->_M_date_format = nl_langinfo_l(D_FMT, (locale_t)__cloc); _M_data->_M_date_era_format = nl_langinfo_l(ERA_D_FMT, @@ -193,7 +193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void __timepunct<wchar_t>:: - _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, + _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, const tm* __tm) const throw() { const size_t __len = wcsftime_l(__s, __maxlen, __format, __tm, @@ -211,7 +211,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION langstring[fmtlen] = L'\0'; \ _M_data->M = langstring; - template<> + template<> void __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc) { @@ -285,7 +285,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION wchar_t holder[128]; size_t fmtlen; - _M_c_locale_timepunct = _S_clone_c_locale(__cloc); + _M_c_locale_timepunct = _S_clone_c_locale(__cloc); WIDE_LANGINFO(_M_date_format, D_FMT) WIDE_LANGINFO(_M_date_era_format, ERA_D_FMT) @@ -345,7 +345,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - template<> + template<> __timepunct<wchar_t>::~__timepunct() { delete [] _M_data->_M_date_format; diff --git a/libstdc++-v3/config/locale/dragonfly/time_members.h b/libstdc++-v3/config/locale/dragonfly/time_members.h index 7eff78e02d5..0fa16e19df3 100644 --- a/libstdc++-v3/config/locale/dragonfly/time_members.h +++ b/libstdc++-v3/config/locale/dragonfly/time_members.h @@ -40,21 +40,21 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> - __timepunct<_CharT>::__timepunct(size_t __refs) - : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), + __timepunct<_CharT>::__timepunct(size_t __refs) + : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), _M_name_timepunct(_S_get_c_name()) { _M_initialize_timepunct(); } template<typename _CharT> - __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) - : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0), + __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) + : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0), _M_name_timepunct(_S_get_c_name()) { _M_initialize_timepunct(); } template<typename _CharT> __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, - size_t __refs) - : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), + size_t __refs) + : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), _M_name_timepunct(0) { if (__builtin_strcmp(__s, _S_get_c_name()) != 0) @@ -79,11 +79,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> __timepunct<_CharT>::~__timepunct() - { + { if (_M_name_timepunct != _S_get_c_name()) delete [] _M_name_timepunct; - delete _M_data; - _S_destroy_c_locale(_M_c_locale_timepunct); + delete _M_data; + _S_destroy_c_locale(_M_c_locale_timepunct); } // specialization diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 794471e05b7..6a750de2d71 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // fall back to the unsafe vsprintf which, in general, can be dangerous // and should be avoided. inline int - __convert_from_v(const __c_locale&, char* __out, + __convert_from_v(const __c_locale&, char* __out, const int __size __attribute__((__unused__)), const char* __fmt, ...) { diff --git a/libstdc++-v3/config/locale/generic/codecvt_members.cc b/libstdc++-v3/config/locale/generic/codecvt_members.cc index 7afb007b54c..3204474e4a9 100644 --- a/libstdc++-v3/config/locale/generic/codecvt_members.cc +++ b/libstdc++-v3/config/locale/generic/codecvt_members.cc @@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_USE_WCHAR_T codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_out(state_type& __state, const intern_type* __from, + do_out(state_type& __state, const intern_type* __from, const intern_type* __from_end, const intern_type*& __from_next, extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const @@ -88,7 +88,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ret = partial; break; } - + memcpy(__to, __buf, __conv); __state = __tmp_state; __to += __conv; @@ -101,12 +101,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __from_next = __from; __to_next = __to; - return __ret; + return __ret; } - + codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_in(state_type& __state, const extern_type* __from, + do_in(state_type& __state, const extern_type* __from, const extern_type* __from_end, const extern_type*& __from_next, intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const @@ -153,10 +153,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __from_next = __from; __to_next = __to; - return __ret; + return __ret; } - int + int codecvt<wchar_t, char, mbstate_t>:: do_encoding() const throw() { @@ -166,9 +166,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (MB_CUR_MAX == 1) __ret = 1; return __ret; - } + } - int + int codecvt<wchar_t, char, mbstate_t>:: do_max_length() const throw() { @@ -176,8 +176,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION int __ret = MB_CUR_MAX; return __ret; } - - int + + int codecvt<wchar_t, char, mbstate_t>:: do_length(state_type& __state, const extern_type* __from, const extern_type* __end, size_t __max) const @@ -211,7 +211,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __max--; } - return __ret; + return __ret; } #endif diff --git a/libstdc++-v3/config/locale/generic/collate_members.cc b/libstdc++-v3/config/locale/generic/collate_members.cc index 59334c326d5..0d0d2472885 100644 --- a/libstdc++-v3/config/locale/generic/collate_members.cc +++ b/libstdc++-v3/config/locale/generic/collate_members.cc @@ -38,30 +38,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // These are basically extensions to char_traits, and perhaps should // be put there instead of here. template<> - int - collate<char>::_M_compare(const char* __one, + int + collate<char>::_M_compare(const char* __one, const char* __two) const throw() - { + { int __cmp = strcoll(__one, __two); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t - collate<char>::_M_transform(char* __to, const char* __from, + collate<char>::_M_transform(char* __to, const char* __from, size_t __n) const throw() { return strxfrm(__to, __from, __n); } #ifdef _GLIBCXX_USE_WCHAR_T template<> - int - collate<wchar_t>::_M_compare(const wchar_t* __one, + int + collate<wchar_t>::_M_compare(const wchar_t* __one, const wchar_t* __two) const throw() { int __cmp = wcscoll(__one, __two); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from, diff --git a/libstdc++-v3/config/locale/generic/ctype_members.cc b/libstdc++-v3/config/locale/generic/ctype_members.cc index bcde5bafe83..8eadb4a333f 100644 --- a/libstdc++-v3/config/locale/generic/ctype_members.cc +++ b/libstdc++-v3/config/locale/generic/ctype_members.cc @@ -40,19 +40,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // NB: The other ctype<char> specializations are in src/locale.cc and // various /config/os/* files. ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) - : ctype<char>(0, false, __refs) - { + : ctype<char>(0, false, __refs) + { if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_ctype); - this->_S_create_c_locale(this->_M_c_locale_ctype, __s); + this->_S_create_c_locale(this->_M_c_locale_ctype, __s); } } ctype_byname<char>::~ctype_byname() { } -#ifdef _GLIBCXX_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T ctype<wchar_t>::__wmask_type ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const throw() { @@ -102,7 +102,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; }; - + wchar_t ctype<wchar_t>::do_toupper(wchar_t __c) const { return towupper(__c); } @@ -117,11 +117,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - + wchar_t ctype<wchar_t>::do_tolower(wchar_t __c) const { return towlower(__c); } - + const wchar_t* ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const { @@ -136,11 +136,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool ctype<wchar_t>:: do_is(mask __m, char_type __c) const - { + { bool __ret = false; // Generically, 15 (instead of 11) since we don't know the numerical // encoding of the various categories in /usr/include/ctype.h. - const size_t __bitmasksize = 15; + const size_t __bitmasksize = 15; for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) if (__m & _M_bit[__bitcur] && iswctype(__c, _M_wmask[__bitcur])) @@ -148,10 +148,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ret = true; break; } - return __ret; + return __ret; } - - const wchar_t* + + const wchar_t* ctype<wchar_t>:: do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const { @@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // Generically, 15 (instead of 11) since we don't know the numerical // encoding of the various categories in /usr/include/ctype.h. - const size_t __bitmasksize = 15; + const size_t __bitmasksize = 15; mask __m = 0; for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) if (iswctype(*__lo, _M_wmask[__bitcur])) @@ -168,8 +168,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - - const wchar_t* + + const wchar_t* ctype<wchar_t>:: do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const { @@ -191,8 +191,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<wchar_t>:: do_widen(char __c) const { return _M_widen[static_cast<unsigned char>(__c)]; } - - const char* + + const char* ctype<wchar_t>:: do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const { @@ -208,16 +208,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION char ctype<wchar_t>:: do_narrow(wchar_t __wc, char __dfault) const - { + { if (__wc >= 0 && __wc < 128 && _M_narrow_ok) return _M_narrow[__wc]; const int __c = wctob(__wc); - return (__c == EOF ? __dfault : static_cast<char>(__c)); + return (__c == EOF ? __dfault : static_cast<char>(__c)); } const wchar_t* ctype<wchar_t>:: - do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, + do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, char* __dest) const { if (_M_narrow_ok) @@ -265,10 +265,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_widen[__i] = btowc(__i); for (size_t __i = 0; __i <= 15; ++__i) - { + { _M_bit[__i] = static_cast<mask>(1 << __i); _M_wmask[__i] = _M_convert_to_wmask(_M_bit[__i]); - } + } } #endif // _GLIBCXX_USE_WCHAR_T diff --git a/libstdc++-v3/config/locale/generic/messages_members.h b/libstdc++-v3/config/locale/generic/messages_members.h index 7a7b8688466..fe1d3df9642 100644 --- a/libstdc++-v3/config/locale/generic/messages_members.h +++ b/libstdc++-v3/config/locale/generic/messages_members.h @@ -44,13 +44,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _M_c_locale_messages = _S_get_c_locale(); } template<typename _CharT> - messages<_CharT>::messages(__c_locale, const char*, size_t __refs) + messages<_CharT>::messages(__c_locale, const char*, size_t __refs) : facet(__refs) { _M_c_locale_messages = _S_get_c_locale(); } template<typename _CharT> - typename messages<_CharT>::catalog - messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, + typename messages<_CharT>::catalog + messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, const char*) const { return this->do_open(__s, __loc); } @@ -60,31 +60,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _S_destroy_c_locale(_M_c_locale_messages); } template<typename _CharT> - typename messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>&, const locale&) const { return 0; } template<typename _CharT> - typename messages<_CharT>::string_type - messages<_CharT>::do_get(catalog, int, int, + typename messages<_CharT>::string_type + messages<_CharT>::do_get(catalog, int, int, const string_type& __dfault) const { return __dfault; } template<typename _CharT> - void - messages<_CharT>::do_close(catalog) const + void + messages<_CharT>::do_close(catalog) const { } // messages_byname template<typename _CharT> messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) - : messages<_CharT>(__refs) - { + : messages<_CharT>(__refs) + { if (__builtin_strcmp(__s, "C") != 0 && __builtin_strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_messages); - this->_S_create_c_locale(this->_M_c_locale_messages, __s); + this->_S_create_c_locale(this->_M_c_locale_messages, __s); } } diff --git a/libstdc++-v3/config/locale/generic/numeric_members.cc b/libstdc++-v3/config/locale/generic/numeric_members.cc index 98a6e85a0c8..f45f7c2846a 100644 --- a/libstdc++-v3/config/locale/generic/numeric_members.cc +++ b/libstdc++-v3/config/locale/generic/numeric_members.cc @@ -34,7 +34,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - template<> + template<> void numpunct<char>::_M_initialize_numpunct(__c_locale) { @@ -48,10 +48,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_decimal_point = '.'; _M_data->_M_thousands_sep = ','; - + for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i]; - + for (size_t __i = 0; __i < __num_base::_S_iend; ++__i) _M_data->_M_atoms_in[__i] = __num_base::_S_atoms_in[__i]; @@ -61,12 +61,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename_size = 5; } - template<> + template<> numpunct<char>::~numpunct() { delete _M_data; } - + #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void numpunct<wchar_t>::_M_initialize_numpunct(__c_locale) { @@ -77,15 +77,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_grouping = ""; _M_data->_M_grouping_size = 0; _M_data->_M_use_grouping = false; - + _M_data->_M_decimal_point = L'.'; _M_data->_M_thousands_sep = L','; - + // Use ctype::widen code without the facet... for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) _M_data->_M_atoms_out[__i] = static_cast<wchar_t>(__num_base::_S_atoms_out[__i]); - + for (size_t __i = 0; __i < __num_base::_S_iend; ++__i) _M_data->_M_atoms_in[__i] = static_cast<wchar_t>(__num_base::_S_atoms_in[__i]); @@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename_size = 5; } - template<> + template<> numpunct<wchar_t>::~numpunct() { delete _M_data; } #endif diff --git a/libstdc++-v3/config/locale/generic/time_members.h b/libstdc++-v3/config/locale/generic/time_members.h index 0b219c1194f..1d626df5f0f 100644 --- a/libstdc++-v3/config/locale/generic/time_members.h +++ b/libstdc++-v3/config/locale/generic/time_members.h @@ -39,24 +39,24 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> - __timepunct<_CharT>::__timepunct(size_t __refs) + __timepunct<_CharT>::__timepunct(size_t __refs) : facet(__refs), _M_data(0) - { + { _M_name_timepunct = _S_get_c_name(); - _M_initialize_timepunct(); + _M_initialize_timepunct(); } template<typename _CharT> - __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) + __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) : facet(__refs), _M_data(__cache) - { + { _M_name_timepunct = _S_get_c_name(); - _M_initialize_timepunct(); + _M_initialize_timepunct(); } template<typename _CharT> - __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, - size_t __refs) + __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, + size_t __refs) : facet(__refs), _M_data(0) { if (__builtin_strcmp(__s, _S_get_c_name()) != 0) @@ -81,11 +81,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> __timepunct<_CharT>::~__timepunct() - { + { if (_M_name_timepunct != _S_get_c_name()) delete [] _M_name_timepunct; delete _M_data; - _S_destroy_c_locale(_M_c_locale_timepunct); + _S_destroy_c_locale(_M_c_locale_timepunct); } _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/locale/gnu/c++locale_internal.h b/libstdc++-v3/config/locale/gnu/c++locale_internal.h index ad4fd044563..8a9b938483d 100644 --- a/libstdc++-v3/config/locale/gnu/c++locale_internal.h +++ b/libstdc++-v3/config/locale/gnu/c++locale_internal.h @@ -63,7 +63,7 @@ extern "C" __typeof(wcscoll_l) __wcscoll_l; extern "C" __typeof(wcsftime_l) __wcsftime_l; extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l; extern "C" __typeof(wctype_l) __wctype_l; -#endif +#endif #endif // GLIBC 2.3 and later diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc index 151a4e4cccb..58e4f84ca18 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.cc +++ b/libstdc++-v3/config/locale/gnu/c_locale.cc @@ -43,7 +43,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void - __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, + __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, const __c_locale& __cloc) throw() { char* __sanity; @@ -70,7 +70,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void - __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, + __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, const __c_locale& __cloc) throw() { char* __sanity; @@ -129,7 +129,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } void - locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, + locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, __c_locale __old) { __cloc = __newlocale(1 << LC_ALL, __s, __old); @@ -145,7 +145,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION locale::facet::_S_destroy_c_locale(__c_locale& __cloc) { if (__cloc && _S_get_c_locale() != __cloc) - __freelocale(__cloc); + __freelocale(__cloc); } __c_locale @@ -261,18 +261,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] = { - "LC_CTYPE", + "LC_CTYPE", "LC_NUMERIC", - "LC_TIME", - "LC_COLLATE", + "LC_TIME", + "LC_COLLATE", "LC_MONETARY", - "LC_MESSAGES", - "LC_PAPER", - "LC_NAME", + "LC_MESSAGES", + "LC_PAPER", + "LC_NAME", "LC_ADDRESS", - "LC_TELEPHONE", - "LC_MEASUREMENT", - "LC_IDENTIFICATION" + "LC_TELEPHONE", + "LC_MEASUREMENT", + "LC_IDENTIFICATION" }; _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc index 451d2195d69..dc1c5d6ba4d 100644 --- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc +++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc @@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_USE_WCHAR_T codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_out(state_type& __state, const intern_type* __from, + do_out(state_type& __state, const intern_type* __from, const intern_type* __from_end, const intern_type*& __from_next, extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const @@ -111,12 +111,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __uselocale(__old); #endif - return __ret; + return __ret; } - + codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_in(state_type& __state, const extern_type* __from, + do_in(state_type& __state, const extern_type* __from, const extern_type* __from_end, const extern_type*& __from_next, intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const @@ -160,12 +160,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION break; } __from_next = __from; - __state = __tmp_state; + __state = __tmp_state; __ret = error; } else if (__from_next && __from_next < __from_chunk_end) { - // It is unclear what to return in this case (see DR 382). + // It is unclear what to return in this case (see DR 382). __to_next += __conv; __ret = partial; } @@ -180,7 +180,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__to_next < __to_end) { // XXX Probably wrong for stateful encodings - __tmp_state = __state; + __tmp_state = __state; ++__from_next; *__to_next++ = L'\0'; } @@ -193,10 +193,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __uselocale(__old); #endif - return __ret; + return __ret; } - int + int codecvt<wchar_t, char, mbstate_t>:: do_encoding() const throw() { @@ -212,9 +212,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __uselocale(__old); #endif return __ret; - } + } - int + int codecvt<wchar_t, char, mbstate_t>:: do_max_length() const throw() { @@ -228,8 +228,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif return __ret; } - - int + + int codecvt<wchar_t, char, mbstate_t>:: do_length(state_type& __state, const extern_type* __from, const extern_type* __end, size_t __max) const @@ -244,10 +244,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // mbsnrtowcs is *very* fast but stops if encounters NUL characters: // in case we advance past it and then continue, in a loop. // NB: mbsnrtowcs is a GNU extension - + // A dummy internal buffer is needed in order for mbsnrtocws to consider // its fourth parameter (it wouldn't with NULL as first parameter). - wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) + wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) * __max)); while (__from < __end && __max) { @@ -281,7 +281,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } if (!__from) __from = __from_chunk_end; - + __ret += __from - __tmp_from; __max -= __conv; @@ -299,7 +299,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __uselocale(__old); #endif - return __ret; + return __ret; } #endif diff --git a/libstdc++-v3/config/locale/gnu/collate_members.cc b/libstdc++-v3/config/locale/gnu/collate_members.cc index 0ea047d343e..ad9ece4ff82 100644 --- a/libstdc++-v3/config/locale/gnu/collate_members.cc +++ b/libstdc++-v3/config/locale/gnu/collate_members.cc @@ -38,30 +38,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // These are basically extensions to char_traits, and perhaps should // be put there instead of here. template<> - int - collate<char>::_M_compare(const char* __one, + int + collate<char>::_M_compare(const char* __one, const char* __two) const throw() - { + { int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t - collate<char>::_M_transform(char* __to, const char* __from, + collate<char>::_M_transform(char* __to, const char* __from, size_t __n) const throw() { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); } #ifdef _GLIBCXX_USE_WCHAR_T template<> - int - collate<wchar_t>::_M_compare(const wchar_t* __one, + int + collate<wchar_t>::_M_compare(const wchar_t* __one, const wchar_t* __two) const throw() { int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from, diff --git a/libstdc++-v3/config/locale/gnu/ctype_members.cc b/libstdc++-v3/config/locale/gnu/ctype_members.cc index 6c9a7d18e42..1aafc12449a 100644 --- a/libstdc++-v3/config/locale/gnu/ctype_members.cc +++ b/libstdc++-v3/config/locale/gnu/ctype_members.cc @@ -39,12 +39,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // NB: The other ctype<char> specializations are in src/locale.cc and // various /config/os/* files. ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) - : ctype<char>(0, false, __refs) - { + : ctype<char>(0, false, __refs) + { if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_ctype); - this->_S_create_c_locale(this->_M_c_locale_ctype, __s); + this->_S_create_c_locale(this->_M_c_locale_ctype, __s); this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper; this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower; this->_M_table = this->_M_c_locale_ctype->__ctype_b; @@ -54,7 +54,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype_byname<char>::~ctype_byname() { } -#ifdef _GLIBCXX_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T ctype<wchar_t>::__wmask_type ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const throw() { @@ -102,7 +102,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - + wchar_t ctype<wchar_t>::do_toupper(wchar_t __c) const { return __towupper_l(__c, _M_c_locale_ctype); } @@ -117,11 +117,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - + wchar_t ctype<wchar_t>::do_tolower(wchar_t __c) const { return __towlower_l(__c, _M_c_locale_ctype); } - + const wchar_t* ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const { @@ -136,7 +136,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool ctype<wchar_t>:: do_is(mask __m, wchar_t __c) const - { + { // The case of __m == ctype_base::space is particularly important, // due to its use in many istream functions. Therefore we deal with // it first, exploiting the knowledge that on GNU systems _M_bit[5] @@ -161,17 +161,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION break; } } - return __ret; + return __ret; } - const wchar_t* + const wchar_t* ctype<wchar_t>:: do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const { for (; __lo < __hi; ++__vec, ++__lo) { // Highest bitmask in ctype_base == 11 - const size_t __bitmasksize = 11; + const size_t __bitmasksize = 11; mask __m = 0; for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype)) @@ -180,8 +180,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - - const wchar_t* + + const wchar_t* ctype<wchar_t>:: do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const { @@ -204,7 +204,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION do_widen(char __c) const { return _M_widen[static_cast<unsigned char>(__c)]; } - const char* + const char* ctype<wchar_t>:: do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const { @@ -230,12 +230,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __uselocale(__old); #endif - return (__c == EOF ? __dfault : static_cast<char>(__c)); + return (__c == EOF ? __dfault : static_cast<char>(__c)); } const wchar_t* ctype<wchar_t>:: - do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, + do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, char* __dest) const { #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) @@ -292,7 +292,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_widen[__j] = btowc(__j); for (size_t __k = 0; __k <= 11; ++__k) - { + { _M_bit[__k] = static_cast<mask>(_ISbit(__k)); _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]); } diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc index 85f36e359af..95cb112d9f1 100644 --- a/libstdc++-v3/config/locale/gnu/monetary_members.cc +++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc @@ -42,9 +42,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Construct and return valid pattern consisting of some combination of: // space none symbol sign value money_base::pattern - money_base::_S_construct_pattern(char __precedes, char __space, + money_base::_S_construct_pattern(char __precedes, char __space, char __posn) throw() - { + { pattern __ret; // This insanely complicated routine attempts to construct a valid @@ -52,7 +52,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // if (__precedes) symbol -> value // else value -> symbol - + // if (__space) space // else none @@ -137,7 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__precedes) { __ret.field[0] = sign; - __ret.field[1] = symbol; + __ret.field[1] = symbol; if (__space) { __ret.field[2] = space; @@ -145,7 +145,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else { - __ret.field[2] = value; + __ret.field[2] = value; __ret.field[3] = none; } } @@ -207,9 +207,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif - template<> + template<> void - moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, + moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, const char*) { if (!_M_data) @@ -239,9 +239,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else { // Named locale. - _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, + _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, __cloc)); - _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, + _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, __cloc)); // Check for NULL, which implies no fractional digits. @@ -252,7 +252,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_decimal_point = '.'; } else - _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, + _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc)); const char* __cgroup = __nl_langinfo_l(__MON_GROUPING, __cloc); @@ -264,11 +264,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION char* __group = 0; char* __ps = 0; char* __ns = 0; - const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc)); + const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc)); __try { size_t __len; - + // Check for NULL, which implies no grouping. if (_M_data->_M_thousands_sep == '\0') { @@ -358,9 +358,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - template<> + template<> void - moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, + moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, const char*) { if (!_M_data) @@ -390,9 +390,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else { // Named locale. - _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, + _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, __cloc)); - _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, + _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, __cloc)); // Check for NULL, which implies no fractional digits. @@ -509,7 +509,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - template<> + template<> moneypunct<char, true>::~moneypunct() { if (_M_data->_M_grouping_size) @@ -524,7 +524,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete _M_data; } - template<> + template<> moneypunct<char, false>::~moneypunct() { if (_M_data->_M_grouping_size) @@ -540,9 +540,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void - moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, + moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) const char*) #else @@ -604,7 +604,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_decimal_point = L'.'; } else - _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, + _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc)); const char* __cgroup = __nl_langinfo_l(__MON_GROUPING, __cloc); @@ -657,9 +657,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_positive_sign = L""; - _M_data->_M_positive_sign_size = + _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); - + __len = strlen(__cnegsign); if (!__nposn) _M_data->_M_negative_sign = L"()"; @@ -672,9 +672,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_negative_sign = L""; - _M_data->_M_negative_sign_size = + _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); - + // _Intl == true. __len = strlen(__ccurr); if (__len) @@ -694,7 +694,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data = 0; delete [] __group; delete [] __wcs_ps; - delete [] __wcs_ns; + delete [] __wcs_ns; #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __uselocale(__old); #else @@ -702,8 +702,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete [] __sav; #endif __throw_exception_again; - } - + } + char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); @@ -723,7 +723,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - template<> + template<> void moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc, #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) @@ -840,7 +840,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_positive_sign = L""; - _M_data->_M_positive_sign_size = + _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); __len = strlen(__cnegsign); @@ -855,7 +855,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else _M_data->_M_negative_sign = L""; - _M_data->_M_negative_sign_size = + _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); // _Intl == true. @@ -877,7 +877,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data = 0; delete [] __group; delete [] __wcs_ps; - delete [] __wcs_ns; + delete [] __wcs_ns; #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __uselocale(__old); #else @@ -906,7 +906,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - template<> + template<> moneypunct<wchar_t, true>::~moneypunct() { if (_M_data->_M_grouping_size) @@ -921,7 +921,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete _M_data; } - template<> + template<> moneypunct<wchar_t, false>::~moneypunct() { if (_M_data->_M_grouping_size) diff --git a/libstdc++-v3/config/locale/gnu/numeric_members.cc b/libstdc++-v3/config/locale/gnu/numeric_members.cc index 5146bcf6e92..6fbf0896a01 100644 --- a/libstdc++-v3/config/locale/gnu/numeric_members.cc +++ b/libstdc++-v3/config/locale/gnu/numeric_members.cc @@ -35,7 +35,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - template<> + template<> void numpunct<char>::_M_initialize_numpunct(__c_locale __cloc) { @@ -61,9 +61,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else { // Named locale. - _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, + _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, __cloc)); - _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, + _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, __cloc)); // Check for NULL, which implies no grouping. @@ -111,17 +111,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename = "false"; _M_data->_M_falsename_size = 5; } - - template<> + + template<> numpunct<char>::~numpunct() { if (_M_data->_M_grouping_size) delete [] _M_data->_M_grouping; delete _M_data; } - + #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc) { @@ -204,7 +204,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename_size = 5; } - template<> + template<> numpunct<wchar_t>::~numpunct() { if (_M_data->_M_grouping_size) diff --git a/libstdc++-v3/config/locale/gnu/time_members.cc b/libstdc++-v3/config/locale/gnu/time_members.cc index c31f3fcf3c3..2e7f7324e4e 100644 --- a/libstdc++-v3/config/locale/gnu/time_members.cc +++ b/libstdc++-v3/config/locale/gnu/time_members.cc @@ -39,7 +39,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void __timepunct<char>:: - _M_put(char* __s, size_t __maxlen, const char* __format, + _M_put(char* __s, size_t __maxlen, const char* __format, const tm* __tm) const throw() { #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) @@ -47,7 +47,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_c_locale_timepunct); #else char* __old = setlocale(LC_ALL, 0); - const size_t __llen = strlen(__old) + 1; + const size_t __llen = strlen(__old) + 1; char* __sav = new char[__llen]; memcpy(__sav, __old, __llen); setlocale(LC_ALL, _M_name_timepunct); @@ -60,7 +60,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __s[0] = '\0'; } - template<> + template<> void __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc) { @@ -130,7 +130,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else { - _M_c_locale_timepunct = _S_clone_c_locale(__cloc); + _M_c_locale_timepunct = _S_clone_c_locale(__cloc); _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc); _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc); @@ -195,7 +195,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<> void __timepunct<wchar_t>:: - _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, + _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, const tm* __tm) const throw() { #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) @@ -216,7 +216,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __s[0] = L'\0'; } - template<> + template<> void __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc) { @@ -286,7 +286,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } else { - _M_c_locale_timepunct = _S_clone_c_locale(__cloc); + _M_c_locale_timepunct = _S_clone_c_locale(__cloc); union { char *__s; wchar_t *__w; } __u; diff --git a/libstdc++-v3/config/locale/gnu/time_members.h b/libstdc++-v3/config/locale/gnu/time_members.h index 7ad846e9d64..51d260e36d2 100644 --- a/libstdc++-v3/config/locale/gnu/time_members.h +++ b/libstdc++-v3/config/locale/gnu/time_members.h @@ -39,21 +39,21 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> - __timepunct<_CharT>::__timepunct(size_t __refs) - : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), + __timepunct<_CharT>::__timepunct(size_t __refs) + : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), _M_name_timepunct(_S_get_c_name()) { _M_initialize_timepunct(); } template<typename _CharT> - __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) - : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0), + __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) + : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0), _M_name_timepunct(_S_get_c_name()) { _M_initialize_timepunct(); } template<typename _CharT> __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, - size_t __refs) - : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), + size_t __refs) + : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), _M_name_timepunct(0) { if (__builtin_strcmp(__s, _S_get_c_name()) != 0) @@ -78,11 +78,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> __timepunct<_CharT>::~__timepunct() - { + { if (_M_name_timepunct != _S_get_c_name()) delete [] _M_name_timepunct; - delete _M_data; - _S_destroy_c_locale(_M_c_locale_timepunct); + delete _M_data; + _S_destroy_c_locale(_M_c_locale_timepunct); } _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc b/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc index 99fd12060c7..7c6ecfaba37 100644 --- a/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc +++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc @@ -30,7 +30,7 @@ #include <locale> -namespace std _GLIBCXX_VISIBILITY(default) +namespace std _GLIBCXX_VISIBILITY(default) { void locale::facet::_S_create_c_locale(__c_locale&, const char*, __c_locale*) @@ -44,7 +44,7 @@ namespace std _GLIBCXX_VISIBILITY(default) locale::facet::_S_clone_c_locale(__c_locale&) throw() { return __c_locale(); } - template<> + template<> void numpunct<char>::_M_initialize_numpunct(__c_locale) { @@ -55,9 +55,9 @@ namespace std _GLIBCXX_VISIBILITY(default) _M_truename = "true"; _M_falsename = "false"; } - + #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void numpunct<wchar_t>::_M_initialize_numpunct(__c_locale) { @@ -70,7 +70,7 @@ namespace std _GLIBCXX_VISIBILITY(default) } #endif - template<> + template<> void moneypunct<char>::_M_initialize_moneypunct(__c_locale) { @@ -87,7 +87,7 @@ namespace std _GLIBCXX_VISIBILITY(default) } #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale) { diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc index 3dbc59c9e7e..412a82c6ee1 100644 --- a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc +++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc @@ -35,11 +35,11 @@ namespace std _GLIBCXX_VISIBILITY(default) // Specializations template<> string - messages<char>::do_get(catalog __c, int __setid, int __msgid, + messages<char>::do_get(catalog __c, int __setid, int __msgid, const string& __dfault) const { nl_catd __nlc = reinterpret_cast<nl_catd>(__c); - return string(catgets(__nlc, __setid, __msgid, __dfault.c_str())); + return string(catgets(__nlc, __setid, __msgid, __dfault.c_str())); } #ifdef _GLIBCXX_USE_WCHAR_T @@ -48,7 +48,7 @@ namespace std _GLIBCXX_VISIBILITY(default) messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const { nl_catd __nlc = reinterpret_cast<nl_catd>(__c); - char* __msg = catgets(__nlc, __setid, __msgid, + char* __msg = catgets(__nlc, __setid, __msgid, _M_convert_to_char(__dfault)); return _M_convert_from_char(__msg); } diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.h b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.h index 791db089748..18184a2f707 100644 --- a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.h +++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.h @@ -39,8 +39,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Non-virtual member functions. template<typename _CharT> - typename messages<_CharT>::catalog - messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, + typename messages<_CharT>::catalog + messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, const char*) const { return this->do_open(__s, __loc); } @@ -50,25 +50,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { } template<typename _CharT> - typename messages<_CharT>::catalog - messages<_CharT>::do_open(const basic_string<char>& __s, + typename messages<_CharT>::catalog + messages<_CharT>::do_open(const basic_string<char>& __s, const locale&) const { return reinterpret_cast<catalog>(catopen(__s.c_str(), NL_CAT_LOCALE)); } template<typename _CharT> - typename messages<_CharT>::string_type - messages<_CharT>::do_get(catalog __c, int __setid, int __msgid, + typename messages<_CharT>::string_type + messages<_CharT>::do_get(catalog __c, int __setid, int __msgid, const string_type& __dfault) const { nl_catd __nlc = reinterpret_cast<nl_catd>(__c); - char* __msg = catgets(__nlc, __setid, __msgid, + char* __msg = catgets(__nlc, __setid, __msgid, _M_convert_to_char(__dfault)); return _M_convert_from_char(__msg); } template<typename _CharT> - void - messages<_CharT>::do_close(catalog __c) const + void + messages<_CharT>::do_close(catalog __c) const { catclose(reinterpret_cast<nl_catd>(__c)); } _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/config/os/aix/ctype_base.h b/libstdc++-v3/config/os/aix/ctype_base.h index 6ce922b7a80..c7d4e052bfd 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 3b6055794e8..2ecd857c553 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 993822ee58b..85dabcfe96e 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 0926044f2ee..9f35532ee89 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 306d8b8a3f8..8ac8847ab7c 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 ae0d08f58a4..cdd9a80e09b 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 3d627c16e12..bf11c9c67f2 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 e7c33d09db9..88a1e09fd99 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 c86f64304dd..451973af6d7 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 3275b21d5ae..41b266a9b0e 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 af2012e53d9..9f35532ee89 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 3347d3324d2..2ec02ae9ac9 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 f5bb12c3b14..57e97f809ee 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 32a00ee1b22..cfe8e907e85 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 38b0699170a..02f8e327208 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 54f817be51c..e62f5f31353 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 e0347258ec5..528b7b7301a 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 9b16c1966a9..ef17a30d02e 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 9b16c1966a9..ef17a30d02e 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 9cf2ecff30a..717303e3703 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 03eaf6b7e0f..cadfeca04e2 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 871a38d9908..c6c7a1f37d2 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 9a9addedd04..470d9dac811 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 01f2883e0a3..148b9f68532 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 54f817be51c..e62f5f31353 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 10565f82e19..8e5be5f27cd 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 75b2f9d11de..7dc9569ca4c 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 be320d9136f..6621715dcd1 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 eefb400de4f..c712a702eef 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 5dcc926cfcb..d965645cd8b 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 17b7de4cb00..dc0f7b003ce 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 9c59666b519..49a4c194354 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; |