|
@@ -86,11 +86,7 @@ Index of this file:
|
|
|
#endif
|
|
|
#define IM_ARRAYSIZE(_ARR) ((int)(sizeof(_ARR) / sizeof(*(_ARR)))) // Size of a static C-style array. Don't use on pointers!
|
|
|
#define IM_UNUSED(_VAR) ((void)(_VAR)) // Used to silence "unused variable warnings". Often useful as asserts may be stripped out from final builds.
|
|
|
-#if (__cplusplus >= 201100) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201100)
|
|
|
#define IM_OFFSETOF(_TYPE,_MEMBER) offsetof(_TYPE, _MEMBER) // Offset of _MEMBER within _TYPE. Standardized as offsetof() in C++11
|
|
|
-#else
|
|
|
-#define IM_OFFSETOF(_TYPE,_MEMBER) ((size_t)&(((_TYPE*)0)->_MEMBER)) // Offset of _MEMBER within _TYPE. Old style macro.
|
|
|
-#endif
|
|
|
|
|
|
// Helper Macros - IM_FMTARGS, IM_FMTLIST: Apply printf-style warnings to our formatting functions.
|
|
|
#if !defined(IMGUI_USE_STB_SPRINTF) && defined(__MINGW32__) && !defined(__clang__)
|
|
@@ -228,17 +224,8 @@ typedef signed short ImS16; // 16-bit signed integer
|
|
|
typedef unsigned short ImU16; // 16-bit unsigned integer
|
|
|
typedef signed int ImS32; // 32-bit signed integer == int
|
|
|
typedef unsigned int ImU32; // 32-bit unsigned integer (often used to store packed colors)
|
|
|
-#if defined(_MSC_VER) && !defined(__clang__)
|
|
|
-typedef signed __int64 ImS64; // 64-bit signed integer (pre and post C++11 with Visual Studio)
|
|
|
-typedef unsigned __int64 ImU64; // 64-bit unsigned integer (pre and post C++11 with Visual Studio)
|
|
|
-#elif (defined(__clang__) || defined(__GNUC__)) && (__cplusplus < 201100)
|
|
|
-#include <stdint.h>
|
|
|
-typedef int64_t ImS64; // 64-bit signed integer (pre C++11)
|
|
|
-typedef uint64_t ImU64; // 64-bit unsigned integer (pre C++11)
|
|
|
-#else
|
|
|
-typedef signed long long ImS64; // 64-bit signed integer (post C++11)
|
|
|
-typedef unsigned long long ImU64; // 64-bit unsigned integer (post C++11)
|
|
|
-#endif
|
|
|
+typedef signed long long ImS64; // 64-bit signed integer (C++11)
|
|
|
+typedef unsigned long long ImU64; // 64-bit unsigned integer (C++11)
|
|
|
|
|
|
// Character types
|
|
|
// (we generally use UTF-8 encoded string in the API. This is storage specifically for a decoded character used for keyboard input and display)
|