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

Remove C++11 member initializers.

Niklas Hauser 2016-03-21 15:23:12 +00:00 committed by Martin Kojtal
parent 2fdf733292
commit 494c303da5
2 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
frameworks\utest/utest/default_handlers.h
View File

@ -34,23 +34,15 @@ namespace v1 {
* This type automatically casts itself into the appropriate handler type, when possible. * This type automatically casts itself into the appropriate handler type, when possible.
* Use the constants to default a handler unambigously. * Use the constants to default a handler unambigously.
*/ */
const struct static const struct
{ {
const test_setup_handler_t test_setup = test_setup_handler_t(1); operator test_setup_handler_t() const { return test_setup_handler_t(1); }
const test_teardown_handler_t test_teardown = test_teardown_handler_t(1); operator test_teardown_handler_t() const { return test_teardown_handler_t(1); }
const test_failure_handler_t test_failure = test_failure_handler_t(1); operator test_failure_handler_t() const { return test_failure_handler_t(1); }
const case_setup_handler_t case_setup = case_setup_handler_t(1); operator case_setup_handler_t() const { return case_setup_handler_t(1); }
const case_teardown_handler_t case_teardown = case_teardown_handler_t(1); operator case_teardown_handler_t() const { return case_teardown_handler_t(1); }
const case_failure_handler_t case_failure = case_failure_handler_t(1); operator case_failure_handler_t() const { return case_failure_handler_t(1); }
operator test_setup_handler_t() const { return test_setup; }
operator test_teardown_handler_t() const { return test_teardown; }
operator test_failure_handler_t() const { return test_failure; }
operator case_setup_handler_t() const { return case_setup; }
operator case_teardown_handler_t() const { return case_teardown; }
operator case_failure_handler_t() const { return case_failure; }
} default_handler; } default_handler;
/** Ignore handler hint. /** Ignore handler hint.
@ -59,31 +51,19 @@ namespace v1 {
* This type automatically casts itself into the appropriate handler type, when possible. * This type automatically casts itself into the appropriate handler type, when possible.
* Use the constants to ignore a handler unambigously. * Use the constants to ignore a handler unambigously.
*/ */
const struct static const struct
{ {
const case_handler_t handler = case_handler_t(NULL); operator case_handler_t() const { return case_handler_t(NULL); }
const case_control_handler_t control = case_control_handler_t(NULL); operator case_control_handler_t() const { return case_control_handler_t(NULL); }
const case_call_count_handler_t call_count = case_call_count_handler_t(NULL); operator case_call_count_handler_t() const { return case_call_count_handler_t(NULL); }
const test_setup_handler_t test_setup = test_setup_handler_t(NULL); operator test_setup_handler_t() const { return test_setup_handler_t(NULL); }
const test_teardown_handler_t test_teardown = test_teardown_handler_t(NULL); operator test_teardown_handler_t() const { return test_teardown_handler_t(NULL); }
const test_failure_handler_t test_failure = test_failure_handler_t(NULL); operator test_failure_handler_t() const { return test_failure_handler_t(NULL); }
const case_setup_handler_t case_setup = case_setup_handler_t(NULL); operator case_setup_handler_t() const { return case_setup_handler_t(NULL); }
const case_teardown_handler_t case_teardown = case_teardown_handler_t(NULL); operator case_teardown_handler_t() const { return case_teardown_handler_t(NULL); }
const case_failure_handler_t case_failure = case_failure_handler_t(NULL); operator case_failure_handler_t() const { return case_failure_handler_t(NULL); }
operator case_handler_t() const { return handler; }
operator case_control_handler_t() const { return control; }
operator case_call_count_handler_t() const { return call_count; }
operator test_setup_handler_t() const { return test_setup; }
operator test_teardown_handler_t() const { return test_teardown; }
operator test_failure_handler_t() const { return test_failure; }
operator case_setup_handler_t() const { return case_setup; }
operator case_teardown_handler_t() const { return case_teardown; }
operator case_failure_handler_t() const { return case_failure; }
} ignore_handler; } ignore_handler;
/** A table of handlers. /** A table of handlers.

9
frameworks\utest/utest/types.h
View File

@ -83,8 +83,9 @@ namespace v1 {
/// Contains the reason and location of the failure. /// Contains the reason and location of the failure.
struct failure_t { struct failure_t {
failure_t(failure_reason_t reason) : reason(reason) {} failure_t() : reason(REASON_NONE), location(LOCATION_NONE) {}
failure_t(location_t location) : location(location) {} failure_t(failure_reason_t reason) : reason(reason), location(LOCATION_NONE) {}
failure_t(location_t location) : reason(REASON_NONE), location(location) {}
failure_t(failure_reason_t reason, location_t location) : reason(reason), location(location) {} failure_t(failure_reason_t reason, location_t location) : reason(reason), location(location) {}
/// @returns a copy of the failure with the reason ignored. /// @returns a copy of the failure with the reason ignored.
@ -92,8 +93,8 @@ namespace v1 {
return failure_t(failure_reason_t(reason | REASON_IGNORE), location); return failure_t(failure_reason_t(reason | REASON_IGNORE), location);
} }
failure_reason_t reason = REASON_NONE; failure_reason_t reason;
location_t location = LOCATION_NONE; location_t location;
}; };