From b5ca6352416995b5edd358623a6ae5db38d5e634 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 25 Apr 2019 15:00:36 -0400 Subject: Feature/uint int definition (#954) * * Moved CPU determination macros to slang.h * Determine SlangUInt/SlangInt from the pointer width (determined from CPU macros) * Removed the UnambiguousInt and UnambigousUInt types - as a previous fragile work around * Removed UInt/Int definition from smart-pointer.h as now in common.h * * Remove ambiguity for PrettyWriter and ints * Improve comment around SlangInt/UInt * More fixes around ambiguity with PrettyWriter and integral types. * Disable VK on OSX. * Force CI to rebuild as spurious error. --- source/core/common.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/core/common.h') diff --git a/source/core/common.h b/source/core/common.h index 5aa7b7737..ba7cd9836 100644 --- a/source/core/common.h +++ b/source/core/common.h @@ -1,6 +1,8 @@ #ifndef CORE_LIB_COMMON_H #define CORE_LIB_COMMON_H +#include "../../slang.h" + #include #ifdef __GNUC__ @@ -19,6 +21,10 @@ namespace Slang typedef int64_t Int64; typedef uint64_t UInt64; + // Define + typedef SlangUInt UInt; + typedef SlangInt Int; + // typedef unsigned short Word; typedef intptr_t PtrInt; -- cgit v1.2.3