Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/doctest.h
Original file line number Diff line number Diff line change
Expand Up @@ -2299,9 +2299,9 @@ class DOCTEST_INTERFACE Context {
#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS

// for subcases
#define DOCTEST_SUBCASE(name) \
if (const doctest::detail::Subcase \
& DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \
#define DOCTEST_SUBCASE(name) \
if (const doctest::detail::Subcase& DOCTEST_ANONYMOUS( \
_DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \
doctest::detail::Subcase(name, __FILE__, __LINE__))

// for grouping tests in test suites by using code blocks
Expand Down Expand Up @@ -2488,7 +2488,7 @@ constexpr T to_lvalue = x;
#expr, DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(as))); \
try { \
expr; \
} catch (const DOCTEST_HANDLE_BRACED_VA_ARGS(as)&) { \
} catch (const DOCTEST_HANDLE_BRACED_VA_ARGS(as) &) { \
_DOCTEST_RB.m_threw = true; \
_DOCTEST_RB.m_threw_as = true; \
} catch (...) { \
Expand Down Expand Up @@ -4348,9 +4348,10 @@ void Color::init() {
#endif // DOCTEST_CONFIG_COLORS_WINDOWS
}

void Color::use(Code
void Color::use(
Code
#ifndef DOCTEST_CONFIG_COLORS_NONE
code
code
#endif // DOCTEST_CONFIG_COLORS_NONE
) {
const ContextState* p = contextState;
Expand Down
1 change: 1 addition & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ int main(int argc, char *argv[]) {
music_hydro.setReRunCount(ireRunHydroCount);
music_hydro.setReRunHydro(false);

std::ignore = std::system("rm -fr *.dat 2> /dev/null");
int running_mode = music_hydro.get_running_mode();
int evoStatus = 0;
if (running_mode == 1 || running_mode == 2) {
Expand Down