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

Fix a rare case of imcompatibility between base_control_t and control_t. 

Both branches of a ternary operator should yield the same type;
compatibility is not enough in that case.
pull/2714/head
Vincent Coubard 2016-08-26 15:39:55 +01:00 committed by Anna Bridge
parent f0fbdbd22c
commit 9bc5adfb21
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TESTS/storage_abstraction/basicAPI/basicAPI.cpp
View File

@ -135,7 +135,7 @@ control_t test_initialize(const size_t call_count)
TEST_ASSERT(rc >= ARM_DRIVER_OK); TEST_ASSERT(rc >= ARM_DRIVER_OK);
if (rc == ARM_DRIVER_OK) { if (rc == ARM_DRIVER_OK) {
TEST_ASSERT_EQUAL(1, capabilities.asynchronous_ops); TEST_ASSERT_EQUAL(1, capabilities.asynchronous_ops);
return (call_count < REPEAT_INSTANCES) ? (CaseTimeout(200) + CaseRepeatAll) : CaseNext; return (call_count < REPEAT_INSTANCES) ? (CaseTimeout(200) + CaseRepeatAll) : (control_t) CaseNext;
} }
TEST_ASSERT(rc == 1); TEST_ASSERT(rc == 1);