h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-22 03:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

This commit changes wchar.h includes to cwchar, and uses std::

Browse Source 
for everything it provides.
This commit is contained in:
Aaron Gyes
2019-03-12 14:06:01 -07:00
parent ecfe4acd0c
commit d5ac239f68
72 changed files with 379 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fallback.cpp
View File

@@ -18,7 +18,7 @@
#include <sys/stat.h> // IWYU pragma: keep
#include <sys/types.h> // IWYU pragma: keep
#include <unistd.h>
#include <wchar.h>
#include <cwchar>
#include <wctype.h>
#include <algorithm>
#if HAVE_GETTEXT
@@ -37,7 +37,7 @@
#include <ncurses/term.h>
#endif
#include <signal.h> // IWYU pragma: keep
#include <wchar.h> // IWYU pragma: keep
#include <cwchar> // IWYU pragma: keep
#include "common.h" // IWYU pragma: keep
#include "fallback.h" // IWYU pragma: keep
@@ -75,7 +75,7 @@ int fish_mkstemp_cloexec(char *name_template) {
/// are not referenced in this file.
// cppcheck-suppress unusedFunction
[[gnu::unused]] static wchar_t *wcsdup_fallback(const wchar_t *in) {
size_t len = wcslen(in);
size_t len = std::wcslen(in);
wchar_t *out = (wchar_t *)malloc(sizeof(wchar_t) * (len + 1));
if (out == 0) {
return 0;
@@ -397,7 +397,7 @@ int flock(int fd, int op) {
// thread-specific locale.
double fish_compat::wcstod_l(const wchar_t *enptr, wchar_t **endptr, locale_t loc) {
locale_t prev_locale = uselocale(loc);
double ret = wcstod(enptr, endptr);
double ret = std::wcstod(enptr, endptr);
uselocale(prev_locale);
return ret;
}