diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-08 19:54:04 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-09 11:10:24 +0800 |
| commit | 45b1d17d3c24e23b0955928e62881e6fd0f7b8c5 (patch) | |
| tree | 9bcebab2edecf9266c332587fdd56fac8b3836c0 /9/sources/cxx-stl/llvm-libc++/libcxx/include/locale | |
| parent | 8226f95d450857358fd08319a906c83739bd5035 (diff) | |
| download | prebuilts_ndk-45b1d17d3c24e23b0955928e62881e6fd0f7b8c5.zip prebuilts_ndk-45b1d17d3c24e23b0955928e62881e6fd0f7b8c5.tar.gz prebuilts_ndk-45b1d17d3c24e23b0955928e62881e6fd0f7b8c5.tar.bz2 | |
Update llvm-libc++
NDK r10d
Change-Id: Ibb4c6a25904ab353d6f976f45ea35179c604287f
Diffstat (limited to '9/sources/cxx-stl/llvm-libc++/libcxx/include/locale')
| -rw-r--r-- | 9/sources/cxx-stl/llvm-libc++/libcxx/include/locale | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/9/sources/cxx-stl/llvm-libc++/libcxx/include/locale b/9/sources/cxx-stl/llvm-libc++/libcxx/include/locale index 7a94613..60c6182 100644 --- a/9/sources/cxx-stl/llvm-libc++/libcxx/include/locale +++ b/9/sources/cxx-stl/llvm-libc++/libcxx/include/locale @@ -417,7 +417,7 @@ int __sscanf_l(const char *__s, locale_t __l, const char *__format, ...) { // and failbit is set in __err. // Else an iterator pointing to the matching keyword is found. If more than // one keyword matches, an iterator to the first matching keyword is returned. -// If on exit __b == __e, eofbit is set in __err. If __case_senstive is false, +// If on exit __b == __e, eofbit is set in __err. If __case_sensitive is false, // __ct is used to force to lower case before comparing characters. // Examples: // Keywords: "a", "abb" @@ -1180,11 +1180,11 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e, break; } // Stage 3 - __a[sizeof(__a)-1] = 0; + __buf.resize(__a_end - __a); #ifdef _LIBCPP_LOCALE__L_EXTENSIONS - if (sscanf_l(__a, _LIBCPP_GET_C_LOCALE, "%p", &__v) != 1) + if (sscanf_l(__buf.c_str(), _LIBCPP_GET_C_LOCALE, "%p", &__v) != 1) #else - if (__sscanf_l(__a, __cloc(), "%p", &__v) != 1) + if (__sscanf_l(__buf.c_str(), __cloc(), "%p", &__v) != 1) #endif __err = ios_base::failbit; // EOF checked @@ -2038,7 +2038,7 @@ template <class _CharT, class _InputIterator> locale::id time_get<_CharT, _InputIterator>::id; -// time_get primatives +// time_get primitives template <class _CharT, class _InputIterator> void @@ -2259,7 +2259,7 @@ time_get<_CharT, _InputIterator>::__get_percent(iter_type& __b, iter_type __e, __err |= ios_base::eofbit; } -// time_get end primatives +// time_get end primitives template <class _CharT, class _InputIterator> _InputIterator |