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

Move constant definitions of non POD object into cpp file. 

It save space and fix the ODR violation.
pull/2559/head
Vincent Coubard 2016-08-26 13:24:45 +01:00
parent 2bc5c3d069
commit 8fa239cdfd
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
features/frameworks/utest/source/utest_types.cpp
View File

@ -114,3 +114,20 @@ const char* utest::v1::stringify(utest::v1::status_t status)
} }
return "Unknown Status"; return "Unknown Status";
} }
const utest::v1::control_t utest::v1::CaseNext(REPEAT_NONE, TIMEOUT_NONE);
const utest::v1::control_t utest::v1::CaseNoRepeat(REPEAT_NONE);
const utest::v1::control_t utest::v1::CaseRepeatAll(REPEAT_ALL);
const utest::v1::control_t utest::v1::CaseRepeatHandler(REPEAT_HANDLER);
const utest::v1::control_t utest::v1::CaseNoTimeout(TIMEOUT_NONE);
const utest::v1::control_t utest::v1::CaseAwait(TIMEOUT_FOREVER);
const utest::v1::control_t utest::v1::CaseRepeat(CaseRepeatAll);
const utest::v1::control_t utest::v1::CaseRepeatHandlerOnly(CaseRepeatHandler);

19
features/frameworks/utest/utest/utest_types.h
View File

@ -202,19 +202,19 @@ namespace v1 {
}; };
/// does not repeat this test case and immediately moves on to the next one without timeout /// does not repeat this test case and immediately moves on to the next one without timeout
const control_t CaseNext(REPEAT_NONE, TIMEOUT_NONE); extern const control_t CaseNext;
/// does not repeat this test case, moves on to the next one /// does not repeat this test case, moves on to the next one
const control_t CaseNoRepeat(REPEAT_NONE); extern const control_t CaseNoRepeat;
/// repeats the test case handler with calling teardown and setup handlers /// repeats the test case handler with calling teardown and setup handlers
const control_t CaseRepeatAll(REPEAT_ALL); extern const control_t CaseRepeatAll;
/// repeats only the test case handler without calling teardown and setup handlers /// repeats only the test case handler without calling teardown and setup handlers
const control_t CaseRepeatHandler(REPEAT_HANDLER); extern const control_t CaseRepeatHandler;
/// No timeout, immediately moves on to the next case, but allows repeats /// No timeout, immediately moves on to the next case, but allows repeats
const control_t CaseNoTimeout(TIMEOUT_NONE); extern const control_t CaseNoTimeout;
/// Awaits until the callback is validated and never times out. Use with caution! /// Awaits until the callback is validated and never times out. Use with caution!
const control_t CaseAwait(TIMEOUT_FOREVER); extern const control_t CaseAwait;
/// Alias class for asynchronous timeout control in milliseconds /// Alias class for asynchronous timeout control in milliseconds
inline control_t CaseTimeout(uint32_t ms) { return ms; } inline control_t CaseTimeout(uint32_t ms) { return ms; }
@ -341,8 +341,11 @@ namespace v1 {
// deprecations // deprecations
__deprecated_message("Use CaseRepeatAll instead.") const control_t CaseRepeat = CaseRepeatAll; __deprecated_message("Use CaseRepeatAll instead.")
__deprecated_message("Use CaseRepeatHandler instead.") const control_t CaseRepeatHandlerOnly = CaseRepeatHandler; extern const control_t CaseRepeat;
__deprecated_message("Use CaseRepeatHandler instead.")
extern const control_t CaseRepeatHandlerOnly;
__deprecated_message("Use REASON_NONE instead.") const failure_reason_t FAILURE_NONE = REASON_NONE; __deprecated_message("Use REASON_NONE instead.") const failure_reason_t FAILURE_NONE = REASON_NONE;
__deprecated_message("Use REASON_UNKNOWN instead.") const failure_reason_t FAILURE_UNKNOWN = REASON_UNKNOWN; __deprecated_message("Use REASON_UNKNOWN instead.") const failure_reason_t FAILURE_UNKNOWN = REASON_UNKNOWN;