ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #145 from adbridge/armcc 

Fix ARMCC compiler warning: Missing arg type.
Russ Butler 2016-05-27 15:38:48 -05:00
parent aa3c0deb70 5e58036974
commit 315a500b38
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frameworks/utest/source/unity_handler.cpp
View File

@ -18,17 +18,16 @@
#include "utest/harness.h" #include "utest/harness.h"
#include "utest/stack_trace.h" #include "utest/stack_trace.h"
#include "utest/unity_handler.h"
extern "C" void utest_unity_assert_failure(void)
void utest_unity_assert_failure()
{ {
UTEST_LOG_FUNCTION(); UTEST_LOG_FUNCTION();
utest::v1::Harness::raise_failure(utest::v1::REASON_ASSERTION); utest::v1::Harness::raise_failure(utest::v1::REASON_ASSERTION);
} }
extern "C" void utest_unity_ignore_failure(void)
void utest_unity_ignore_failure()
{ {
UTEST_LOG_FUNCTION(); UTEST_LOG_FUNCTION();
utest::v1::Harness::raise_failure(utest::v1::failure_reason_t(utest::v1::REASON_ASSERTION | utest::v1::REASON_IGNORE)); utest::v1::Harness::raise_failure(utest::v1::failure_reason_t(utest::v1::REASON_ASSERTION | utest::v1::REASON_IGNORE));

12
frameworks/utest/utest/unity_handler.h
View File

@ -21,10 +21,18 @@
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
/// this function is called from the unity module when an assertion failed. /// this function is called from the unity module when an assertion failed.
void utest_unity_assert_failure(); void utest_unity_assert_failure(void);
/// this function is called from the unity module when an assertion failed, but is ignored. /// this function is called from the unity module when an assertion failed, but is ignored.
void utest_unity_ignore_failure(); void utest_unity_ignore_failure(void);
#ifdef __cplusplus
}
#endif
#endif // UTEST_UNITY_ASSERT_FAILURE_H #endif // UTEST_UNITY_ASSERT_FAILURE_H