From 7e79dbfedfc019b269139b5308e4811938b75278 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 18 Nov 2022 11:34:03 +0100 Subject: compat: remove integer-types header Other headers incldue and anyway. --- compat/assert.hpp | 1 - compat/int-hash.hpp | 2 +- compat/integer-types.hpp | 59 ------------------------------------------------ 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 compat/integer-types.hpp (limited to 'compat') diff --git a/compat/assert.hpp b/compat/assert.hpp index 0953ad90..0afd0772 100644 --- a/compat/assert.hpp +++ b/compat/assert.hpp @@ -1,5 +1,4 @@ #pragma once -#include "defs.hpp" #include #include diff --git a/compat/int-hash.hpp b/compat/int-hash.hpp index ee2dbf16..43b92605 100644 --- a/compat/int-hash.hpp +++ b/compat/int-hash.hpp @@ -1,5 +1,5 @@ #pragma once -#include "integer-types.hpp" +#include namespace floormat { diff --git a/compat/integer-types.hpp b/compat/integer-types.hpp deleted file mode 100644 index 6411599f..00000000 --- a/compat/integer-types.hpp +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#ifdef _MSC_VER -#ifdef _WIN64 -typedef unsigned __int64 size_t; -typedef __int64 ptrdiff_t; -typedef __int64 intptr_t; -typedef unsigned __int64 uintptr_t; -#else -typedef unsigned int size_t; -typedef int ptrdiff_t; -typedef int intptr_t; -typedef unsigned int uintptr_t; -#endif -typedef signed char int8_t; -typedef short int16_t; -typedef int int32_t; -typedef long long int64_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long long uint64_t; -#elif __GNUG__ -typedef __SIZE_TYPE__ size_t; -typedef __PTRDIFF_TYPE__ ptrdiff_t; -typedef __INTPTR_TYPE__ intptr_t; -typedef __UINTPTR_TYPE__ uintptr_t; - -typedef __INT8_TYPE__ int8_t; -typedef __INT16_TYPE__ int16_t; -typedef __INT32_TYPE__ int32_t; -typedef __INT64_TYPE__ int64_t; -typedef __UINT8_TYPE__ uint8_t; -typedef __UINT16_TYPE__ uint16_t; -typedef __UINT32_TYPE__ uint32_t; -typedef __UINT64_TYPE__ uint64_t; -#else -#define FM_NO_INTTYPES_FORWARD_DECLARATION -#include -#include -#endif - -#ifndef FM_NO_INTTYPES_FORWARD_DECLARATION -namespace std { -using ::size_t; -using ::ptrdiff_t; -using ::intptr_t; -using ::uintptr_t; - -using ::int8_t; -using ::int16_t; -using ::int32_t; -using ::int64_t; -using ::uint8_t; -using ::uint16_t; -using ::uint32_t; -using ::uint64_t; -} // namespace std -#endif -- cgit v1.2.3