Skip to content

Commit

Permalink
Remove superfluous semicolon in the INFO macro
Browse files Browse the repository at this point in the history
Closes #1456
  • Loading branch information
horenmar committed Oct 29, 2019
1 parent 1417617 commit 557b336
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 3 additions & 1 deletion docs/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
## 3.0.0 (in progress)

### Breaking changes
* `ANON_TEST_CASE` has been removed, use `TEST_CASE` with no arguments instead.
* `ANON_TEST_CASE` has been removed, use `TEST_CASE` with no arguments instead (#1220)

### Fixes
* The `INFO` macro no longer contains superfluous semicolon (#1456)

## 2.10.2

Expand Down
2 changes: 1 addition & 1 deletion include/internal/catch_capture.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@

///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_INFO( macroName, log ) \
Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )

///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
Expand Down
14 changes: 7 additions & 7 deletions projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ TEST_CASE("Generators internals", "[generators][internals]") {
const auto step = .1;

auto gen = range(rangeStart, rangeEnd, step);
auto expected = rangeStart;
auto expected = rangeStart;
while( (rangeEnd - expected) > step ) {
INFO( "Current expected value is " << expected )
INFO( "Current expected value is " << expected );
REQUIRE(gen.get() == Approx(expected));
REQUIRE(gen.next());

Expand All @@ -198,9 +198,9 @@ TEST_CASE("Generators internals", "[generators][internals]") {
const auto step = .3;

auto gen = range(rangeStart, rangeEnd, step);
auto expected = rangeStart;
auto expected = rangeStart;
while( (rangeEnd - expected) > step ) {
INFO( "Current expected value is " << expected )
INFO( "Current expected value is " << expected );
REQUIRE(gen.get() == Approx(expected));
REQUIRE(gen.next());

Expand All @@ -214,16 +214,16 @@ TEST_CASE("Generators internals", "[generators][internals]") {
const auto step = .3;

auto gen = range(rangeStart, rangeEnd, step);
auto expected = rangeStart;
auto expected = rangeStart;
while( (rangeEnd - expected) > step ) {
INFO( "Current expected value is " << expected )
INFO( "Current expected value is " << expected );
REQUIRE(gen.get() == Approx(expected));
REQUIRE(gen.next());

expected += step;
}
REQUIRE_FALSE(gen.next());
}
}
}
}
SECTION("Negative manual step") {
Expand Down

0 comments on commit 557b336

Please sign in to comment.