diff options
| author | Sinan Kaya <41809318+franksinankaya@users.noreply.github.com> | 2019-02-18 00:12:28 -0500 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-17 21:12:28 -0800 |
| commit | f522e39d4a1da2a4b4859c5db5c741193d098984 (patch) | |
| tree | b040b9fd4f68f674915ddf398de0c6488736cd79 /src | |
| parent | 6252e7d5b428b17e46fc4424bdf6fad38ebd1c35 (diff) | |
| download | coreclr-f522e39d4a1da2a4b4859c5db5c741193d098984.tar.gz coreclr-f522e39d4a1da2a4b4859c5db5c741193d098984.tar.bz2 coreclr-f522e39d4a1da2a4b4859c5db5c741193d098984.zip | |
Fix Integer Rounding issue and duplicate definition of __deref in sal.h (#22645)
* Fix large integer truncation
pal/pal.h:4988:43:
warning: large integer implicitly truncated to unsigned type
[-Woverflow]
static const SIZE_T NoTargetFrameSp = SIZE_MAX;
^~~~~~~~
* Fix compilation error with GCC
/usr/include/c++/7.3.0/debug/functions.h:452:15: error: expected unqualified-id before ')' token
__deref();
^
/usr/include/c++/7.3.0/debug/functions.h:455:34: error: expected primary-expression before '<' token
typename = decltype(__deref<_It>() < __deref<_It>())>
^
/usr/include/c++/7.3.0/debug/functions.h:455:38: error: expected primary-expression before '>' token
typename = decltype(__deref<_It>() < __deref<_It>())>
^
/usr/include/c++/7.3.0/debug/functions.h:455:40: error: expected primary-expression before ')' token
typename = decltype(__deref<_It>() < __deref<_It>())>
^
Diffstat (limited to 'src')
| -rw-r--r-- | src/pal/inc/pal.h | 2 | ||||
| -rw-r--r-- | src/pal/inc/rt/sal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h index 20befc9de4..0422a8886e 100644 --- a/src/pal/inc/pal.h +++ b/src/pal/inc/pal.h @@ -4979,7 +4979,7 @@ PAL_FreeExceptionRecords( struct PAL_SEHException { private: - static const SIZE_T NoTargetFrameSp = SIZE_MAX; + static const SIZE_T NoTargetFrameSp = (SIZE_T)SIZE_MAX; void Move(PAL_SEHException& ex) { diff --git a/src/pal/inc/rt/sal.h b/src/pal/inc/rt/sal.h index e5622a817b..9a8c2a480f 100644 --- a/src/pal/inc/rt/sal.h +++ b/src/pal/inc/rt/sal.h @@ -2604,6 +2604,7 @@ extern "C" { #ifndef PAL_STDCPP_COMPAT #define __null #define __notnull + #define __deref #endif // !PAL_STDCPP_COMPAT #define __maybenull #define __readonly @@ -2618,7 +2619,6 @@ extern "C" { #define __writableTo(size) #define __elem_writableTo(size) #define __byte_writableTo(size) - #define __deref #define __pre #define __post #define __precond(expr) |