From 8555513247ef7a03a6e0bb64fd5d6c65db436aa7 Mon Sep 17 00:00:00 2001 From: Kamil Sroka Date: Mon, 9 Jul 2018 18:17:46 +0200 Subject: [PATCH] [build] fix errors and warnings when building on IAR and Keil (#2868) --- src/core/common/string.cpp | 2 +- src/core/thread/lowpan.cpp | 4 ++-- .../libraries/crypto/nrf52840-mbedtls-config.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/common/string.cpp b/src/core/common/string.cpp index b7dd42ca7..e11242b34 100644 --- a/src/core/common/string.cpp +++ b/src/core/common/string.cpp @@ -74,4 +74,4 @@ otError StringBase::Write(char *aBuffer, uint16_t aSize, uint16_t &aLength, cons #endif // OT_STRING_WINDOWS_WORKAROUND -} // namespace ot \ No newline at end of file +} // namespace ot diff --git a/src/core/thread/lowpan.cpp b/src/core/thread/lowpan.cpp index 146b5974a..7e9ac33e4 100644 --- a/src/core/thread/lowpan.cpp +++ b/src/core/thread/lowpan.cpp @@ -1226,13 +1226,13 @@ otError FragmentHeader::Init(const Message &aMessage, uint16_t aOffset) otError error = OT_ERROR_NONE; uint16_t bytesRead; - bytesRead = aMessage.Read(aOffset, sizeof(mDispatchSize), &mDispatchSize); + bytesRead = aMessage.Read(aOffset, sizeof(mDispatchSize), reinterpret_cast(&mDispatchSize)); VerifyOrExit(bytesRead == sizeof(mDispatchSize), error = OT_ERROR_PARSE); aOffset += bytesRead; VerifyOrExit(IsFragmentHeader(), error = OT_ERROR_PARSE); - bytesRead = aMessage.Read(aOffset, sizeof(mTag), &mTag); + bytesRead = aMessage.Read(aOffset, sizeof(mTag), reinterpret_cast(&mTag)); VerifyOrExit(bytesRead == sizeof(mTag), error = OT_ERROR_PARSE); aOffset += bytesRead; diff --git a/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h b/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h index 9b9e18383..dd7508d46 100644 --- a/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h +++ b/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h @@ -34,4 +34,5 @@ #if defined(__ICCARM__) _Pragma("diag_suppress=Pe549") + _Pragma("diag_suppress=Pa082") #endif