diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-11-16 17:45:35 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-11-16 17:45:35 +0000 |
| commit | c68e412864eb454659168dae5d26cd6ac73d0e55 (patch) | |
| tree | 59ed3b5c083d11cecc6c4148fffb2bdb8d9d95c5 /libstdc++-v3/include | |
| parent | 06bcd7510e792c17a6a5354c612cf288b37a08c4 (diff) | |
| download | gcc-c68e412864eb454659168dae5d26cd6ac73d0e55.zip gcc-c68e412864eb454659168dae5d26cd6ac73d0e55.tar.gz gcc-c68e412864eb454659168dae5d26cd6ac73d0e55.tar.bz2 | |
locale_facets.tcc (__verify_grouping): Move...
2007-11-16 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (__verify_grouping): Move...
* src/locale_facets.cc: ... here.
* config/abi/pre/gnu.ver: Update exports.
From-SVN: r130233
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 000d6fb..12902f7 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -121,7 +121,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 1,222,444 == __grouping_tmp of "\1\3\3" // __grouping is parsed R to L // 1,222,444 == __grouping of "\3" == "\3\3\3" - static bool + bool __verify_grouping(const char* __grouping, size_t __grouping_size, const string& __grouping_tmp); @@ -1237,30 +1237,6 @@ _GLIBCXX_END_LDBL_NAMESPACE _Traits::copy(__news + __plen, __olds + __mod, __oldlen - __mod); } - bool - __verify_grouping(const char* __grouping, size_t __grouping_size, - const string& __grouping_tmp) - { - const size_t __n = __grouping_tmp.size() - 1; - const size_t __min = std::min(__n, size_t(__grouping_size - 1)); - size_t __i = __n; - bool __test = true; - - // Parsed number groupings have to match the - // numpunct::grouping string exactly, starting at the - // right-most point of the parsed sequence of elements ... - for (size_t __j = 0; __j < __min && __test; --__i, ++__j) - __test = __grouping_tmp[__i] == __grouping[__j]; - for (; __i && __test; --__i) - __test = __grouping_tmp[__i] == __grouping[__min]; - // ... but the first parsed grouping can be <= numpunct - // grouping (only do the check if the numpunct char is > 0 - // because <= 0 means any size is ok). - if (static_cast<signed char>(__grouping[__min]) > 0) - __test &= __grouping_tmp[0] <= __grouping[__min]; - return __test; - } - template<typename _CharT> _CharT* __add_grouping(_CharT* __s, _CharT __sep, |