h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-25 18:31:20 -03:00
Code Issues Packages Projects Releases Wiki Activity

Mark a bunch of constructors as explicit

Browse Source 
This prevents undesired implicit conversions
This commit is contained in:
ridiculousfish
2016-02-27 19:38:15 -08:00
parent 88a785e321
commit 10f3ea0008
22 changed files with 45 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/builtin.cpp
View File

@@ -2805,7 +2805,7 @@ static int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv)
wcstring tokens;
tokens.reserve(buff.size());
bool empty = true;
for (wcstring_range loc = wcstring_tok(buff, ifs); loc.first != wcstring::npos; loc = wcstring_tok(buff, ifs, loc))
{
if (!empty) tokens.push_back(ARRAY_SEP);
@@ -2820,7 +2820,7 @@ static int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv)
while (i<argc)
{
loc = wcstring_tok(buff, (i+1<argc) ? ifs : L"", loc);
loc = wcstring_tok(buff, (i+1<argc) ? ifs : wcstring(), loc);
env_set(argv[i], loc.first == wcstring::npos ? L"" : &buff.c_str()[loc.first], place);
++i;
@@ -3141,7 +3141,7 @@ static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv)
}
else
{
dir_in = argv[1];
dir_in = env_var_t(argv[1]);
}
bool got_cd_path = false;