AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-20875 Include <cstddef> for max_align_t

Browse Source 
The definition of max_align_t is not guaranteed to be available unless
the appropriate header is included. Since use of <stddef.h> from C++ is
deprecated, that's <cstddef>, and max_align_t is thus defined under the
std namespace rather than in the global namespace.
This commit is contained in:
Joshua Root 2019-10-22 06:18:00 +11:00 committed by Jeff Genovy
parent 09d409f5f4
commit a3078fb8c8
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/common/uarrsort.cpp
View File

@ -18,6 +18,8 @@
* Internal function for sorting arrays.
*/
#include <cstddef>
#include "unicode/utypes.h"
#include "cmemory.h"
#include "uarrsort.h"
@ -35,7 +37,7 @@ enum {
};
static constexpr int32_t sizeInMaxAlignTs(int32_t sizeInBytes) {
return (sizeInBytes + sizeof(max_align_t) - 1) / sizeof(max_align_t);
return (sizeInBytes + sizeof(std::max_align_t) - 1) / sizeof(std::max_align_t);
}
/* UComparator convenience implementations ---------------------------------- */
@ -139,7 +141,7 @@ static void
insertionSort(char *array, int32_t length, int32_t itemSize,
UComparator *cmp, const void *context, UErrorCode *pErrorCode) {
icu::MaybeStackArray<max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE)> v;
icu::MaybeStackArray<std::max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE)> v;
if (sizeInMaxAlignTs(itemSize) > v.getCapacity() &&
v.resize(sizeInMaxAlignTs(itemSize)) == nullptr) {
*pErrorCode = U_MEMORY_ALLOCATION_ERROR;
@ -233,7 +235,7 @@ static void
quickSort(char *array, int32_t length, int32_t itemSize,
UComparator *cmp, const void *context, UErrorCode *pErrorCode) {
/* allocate two intermediate item variables (x and w) */
icu::MaybeStackArray<max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE) * 2> xw;
icu::MaybeStackArray<std::max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE) * 2> xw;
if(sizeInMaxAlignTs(itemSize)*2 > xw.getCapacity() &&
xw.resize(sizeInMaxAlignTs(itemSize) * 2) == nullptr) {
*pErrorCode=U_MEMORY_ALLOCATION_ERROR;

6
icu4c/source/common/utext.cpp
View File

@ -16,6 +16,8 @@
* created by: Markus W. Scherer
*/
#include <cstddef>
#include "unicode/utypes.h"
#include "unicode/ustring.h"
#include "unicode/unistr.h"
@ -567,7 +569,7 @@ enum {
struct ExtendedUText {
UText ut;
max_align_t extension;
std::max_align_t extension;
};
static const UText emptyText = UTEXT_INITIALIZER;
@ -582,7 +584,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) {
// We need to heap-allocate storage for the new UText
int32_t spaceRequired = sizeof(UText);
if (extraSpace > 0) {
spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(max_align_t);
spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(std::max_align_t);
}
ut = (UText *)uprv_malloc(spaceRequired);
if (ut == NULL) {

4
icu4c/source/tools/toolutil/toolutil.cpp
View File

@ -60,6 +60,8 @@
#include <errno.h>
#include <cstddef>
#include "unicode/errorcode.h"
#include "unicode/putil.h"
#include "cmemory.h"
@ -243,7 +245,7 @@ struct UToolMemory {
char name[64];
int32_t capacity, maxCapacity, size, idx;
void *array;
alignas(max_align_t) char staticArray[1];
alignas(std::max_align_t) char staticArray[1];
};
U_CAPI UToolMemory * U_EXPORT2