diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2011-09-21 12:39:44 +0400 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2011-09-21 12:39:44 +0400 |
| commit | 89728139cbf9a73815aa3720d3bc0b740f1be197 (patch) | |
| tree | af1acce734e24bb04b66e16e501a558df95ace8d /libcxx/include/locale | |
| parent | 30909031a7f766a758b991891bc1678e7da82777 (diff) | |
Fixes for FreeBSD, including some fairly obvious copy-and-paste errors.
libc++ now mostly works on FreeBSD with libcxxrt and this patch applied to the base system:
http://lists.freebsd.org/pipermail/freebsd-hackers/attachments/20110920/e666632c/xlocale-0001.obj
Summary of tests on FreeBSD:
****************************************************
Results for /root/libcxx/test:
using FreeBSD clang version 3.0 (trunk 135360) 20110717
Target: x86_64-unknown-freebsd9.0
Thread model: posix
with -std=c++0x -stdlib=libc++ -I/root/libcxx/include -L/root/libcxx/build/lib
----------------------------------------------------
sections without tests : 1
sections with failures : 48
sections without failures: 1015
+ ----
total number of sections : 1064
----------------------------------------------------
number of tests failed : 145
number of tests passed : 4179
+ ----
total number of tests : 4324
****************************************************
(Many due to this clang version not supporting C++ atomics)
More fixes to follow...
llvm-svn: 140245
Diffstat (limited to 'libcxx/include/locale')
| -rw-r--r-- | libcxx/include/locale | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/include/locale b/libcxx/include/locale index 0e3a35d15d78..e40a04ce1546 100644 --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -272,7 +272,7 @@ size_t __mbsnrtowcs_l(wchar_t * __dest, const char **__src, size_t __nms, size_t __len, mbstate_t *__ps, locale_t __l) { #ifdef _LIBCPP_LOCALE__L_EXTENSIONS - return mbsnrtowcs_l(__dest, __src, __nms__len, __ps, __l); + return mbsnrtowcs_l(__dest, __src, __nms, __len, __ps, __l); #else __locale_raii __current(uselocale(__l), uselocale); return mbsnrtowcs(__dest, __src, __nms, __len, __ps); @@ -295,7 +295,7 @@ _LIBCPP_ALWAYS_INLINE inline int __mbtowc_l(wchar_t *__pwc, const char *__pmb, size_t __max, locale_t __l) { #ifdef _LIBCPP_LOCALE__L_EXTENSIONS - return mbtowc(__pwc, __pmb, __max, __l); + return mbtowc_l(__pwc, __pmb, __max, __l); #else __locale_raii __current(uselocale(__l), uselocale); return mbtowc(__pwc, __pmb, __max); @@ -1754,13 +1754,13 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob, __nc = asprintf_l(&__nb, 0, __fmt, (int)__iob.precision(), __v); #else __nc = __asprintf_l(&__nb, __cloc(), __fmt, - (int)__iob.precision()); + (int)__iob.precision(), __v); #endif else #ifdef _LIBCPP_STABLE_APPLE_ABI __nc = asprintf_l(&__nb, 0, __fmt, __v); #else - __nc = __asprintf_l(&__nb, __cloc(), __fmt, (int)__iob.precision()); + __nc = __asprintf_l(&__nb, __cloc(), __fmt, (int)__iob.precision(), __v); #endif if (__nb == 0) __throw_bad_alloc(); @@ -1823,13 +1823,13 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob, __nc = asprintf_l(&__nb, 0, __fmt, (int)__iob.precision(), __v); #else __nc = __asprintf_l(&__nb, __cloc(), __fmt, - (int)__iob.precision()); + (int)__iob.precision(), __v); #endif else #ifdef _LIBCPP_STABLE_APPLE_ABI __nc = asprintf_l(&__nb, 0, __fmt, __v); #else - __nc = __asprintf_l(&__nb, __cloc(), __fmt, (int)__iob.precision()); + __nc = __asprintf_l(&__nb, __cloc(), __fmt, __v); #endif if (__nb == 0) __throw_bad_alloc(); |