Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation by using std::ptrdiff_t instead of ptrdiff_t

Browse source 
Signed-off-by: lledey <lledey@gmail.com>
This commit is contained in:
lledey 2013-02-23 21:47:10 +01:00
parent a8e92639af
commit bbab6b2fdc
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common.cpp
View file

@ -2176,16 +2176,16 @@ template <typename CharType_t>
static CharType_t **make_null_terminated_array_helper(const std::vector<std::basic_string<CharType_t> > &argv) static CharType_t **make_null_terminated_array_helper(const std::vector<std::basic_string<CharType_t> > &argv)
{ {
size_t count = argv.size(); size_t count = argv.size();
/* We allocate everything in one giant block. First compute how much space we need. */ /* We allocate everything in one giant block. First compute how much space we need. */
/* N + 1 pointers */ /* N + 1 pointers */
size_t pointers_allocation_len = (count + 1) * sizeof(CharType_t *); size_t pointers_allocation_len = (count + 1) * sizeof(CharType_t *);
/* In the very unlikely event that CharType_t has stricter alignment requirements than does a pointer, round us up to the size of a CharType_t */ /* In the very unlikely event that CharType_t has stricter alignment requirements than does a pointer, round us up to the size of a CharType_t */
pointers_allocation_len += sizeof(CharType_t) - 1; pointers_allocation_len += sizeof(CharType_t) - 1;
pointers_allocation_len -= pointers_allocation_len % sizeof(CharType_t); pointers_allocation_len -= pointers_allocation_len % sizeof(CharType_t);
/* N null terminated strings */ /* N null terminated strings */
size_t strings_allocation_len = 0; size_t strings_allocation_len = 0;
for (size_t i=0; i < count; i++) for (size_t i=0; i < count; i++)
@ -2193,22 +2193,22 @@ static CharType_t **make_null_terminated_array_helper(const std::vector<std::bas
/* The size of the string, plus a null terminator */ /* The size of the string, plus a null terminator */
strings_allocation_len += (argv.at(i).size() + 1) * sizeof(CharType_t); strings_allocation_len += (argv.at(i).size() + 1) * sizeof(CharType_t);
} }
/* Now allocate their sum */ /* Now allocate their sum */
unsigned char *base = static_cast<unsigned char *>(malloc(pointers_allocation_len + strings_allocation_len)); unsigned char *base = static_cast<unsigned char *>(malloc(pointers_allocation_len + strings_allocation_len));
if (! base) return NULL; if (! base) return NULL;
/* Divvy it up into the pointers and strings */ /* Divvy it up into the pointers and strings */
CharType_t **pointers = reinterpret_cast<CharType_t **>(base); CharType_t **pointers = reinterpret_cast<CharType_t **>(base);
CharType_t *strings = reinterpret_cast<CharType_t *>(base + pointers_allocation_len); CharType_t *strings = reinterpret_cast<CharType_t *>(base + pointers_allocation_len);
/* Start copying */ /* Start copying */
for (size_t i=0; i < count; i++) for (size_t i=0; i < count; i++)
{ {
const std::basic_string<CharType_t> &str = argv.at(i); const std::basic_string<CharType_t> &str = argv.at(i);
// store the current string pointer into self // store the current string pointer into self
*pointers++ = strings; *pointers++ = strings;
// copy the string into strings // copy the string into strings
strings = std::copy(str.begin(), str.end(), strings); strings = std::copy(str.begin(), str.end(), strings);
// each string needs a null terminator // each string needs a null terminator
@ -2216,12 +2216,12 @@ static CharType_t **make_null_terminated_array_helper(const std::vector<std::bas
} }
// array of pointers needs a null terminator // array of pointers needs a null terminator
*pointers++ = NULL; *pointers++ = NULL;
// Make sure we know what we're doing // Make sure we know what we're doing
assert((unsigned char *)pointers - base == (ptrdiff_t)pointers_allocation_len); assert((unsigned char *)pointers - base == (std::ptrdiff_t)pointers_allocation_len);
assert((unsigned char *)strings - (unsigned char *)pointers == (ptrdiff_t)strings_allocation_len); assert((unsigned char *)strings - (unsigned char *)pointers == (std::ptrdiff_t)strings_allocation_len);
assert((unsigned char *)strings - base == (ptrdiff_t)(pointers_allocation_len + strings_allocation_len)); assert((unsigned char *)strings - base == (std::ptrdiff_t)(pointers_allocation_len + strings_allocation_len));
// Return what we did // Return what we did
return reinterpret_cast<CharType_t**>(base); return reinterpret_cast<CharType_t**>(base);
} }
@ -2235,4 +2235,3 @@ char **make_null_terminated_array(const std::vector<std::string> &lst)
{ {
return make_null_terminated_array_helper(lst); return make_null_terminated_array_helper(lst);
} }