drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox/std] Conform size_t to standard

Browse Source
This commit is contained in:
Gary Talent 2018-04-12 19:23:12 -05:00
parent 57a9221fb3
commit ad62d4c012
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deps/ox/src/ox/std/types.hpp vendored
View File

@ -56,28 +56,27 @@ struct ValErr {
} }
#if defined(_LP64) || defined(__ppc64__) || defined(__aarch64__) #if defined(_LP64) || defined(__ppc64__) || defined(__aarch64__)
typedef unsigned long size_t;
typedef long intptr_t; typedef long intptr_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
#elif defined(_WIN64) #elif defined(_WIN64)
typedef uint64_t size_t;
typedef int64_t intptr_t; typedef int64_t intptr_t;
typedef uint64_t uintptr_t; typedef uint64_t uintptr_t;
#elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__) #elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__)
typedef uint32_t size_t;
typedef int32_t intptr_t; typedef int32_t intptr_t;
typedef uint32_t uintptr_t; typedef uint32_t uintptr_t;
#else #else
#error size_t, intptr_t, and uintptr_t undefined #error intptr_t, and uintptr_t undefined
#endif #endif
namespace std { namespace std {
typedef decltype(nullptr) nullptr_t; using nullptr_t = decltype(nullptr);
typedef ::size_t size_t; using size_t = decltype(alignof(int));
} }
using std::size_t;
static_assert(sizeof(int8_t) == 1, "int8_t is wrong size"); static_assert(sizeof(int8_t) == 1, "int8_t is wrong size");
static_assert(sizeof(int16_t) == 2, "int16_t is wrong size"); static_assert(sizeof(int16_t) == 2, "int16_t is wrong size");
static_assert(sizeof(int32_t) == 4, "int32_t is wrong size"); static_assert(sizeof(int32_t) == 4, "int32_t is wrong size");
@ -89,5 +88,3 @@ static_assert(sizeof(uint16_t) == 2, "uint16_t is wrong size");
static_assert(sizeof(uint32_t) == 4, "uint32_t is wrong size"); static_assert(sizeof(uint32_t) == 4, "uint32_t is wrong size");
static_assert(sizeof(uint64_t) == 8, "uint64_t is wrong size"); static_assert(sizeof(uint64_t) == 8, "uint64_t is wrong size");
static_assert(sizeof(uintptr_t) == sizeof(void*), "uintptr_t is wrong size"); static_assert(sizeof(uintptr_t) == sizeof(void*), "uintptr_t is wrong size");
static_assert(sizeof(size_t) == sizeof(void*), "size_t is wrong size");