Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-06-16 15:09:16 +0200
committerMartin Hořeňovský2019-10-29 14:07:18 +0100
commit557b3361254f4503a34602d4ad8bd35fce33de8c (patch)
tree9869a84b17a321a9612f8ea13be871edaaff0b36
parent141761745a4a8fe84414364f043e25ee00bc834f (diff)
downloadcatch3-557b3361254f4503a34602d4ad8bd35fce33de8c.tar.gz
Remove superfluous semicolon in the INFO macro
Closes #1456
-rw-r--r--docs/release-notes.md4
-rw-r--r--include/internal/catch_capture.hpp2
-rw-r--r--projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp14
3 files changed, 11 insertions, 9 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md
index c49ddefa..46e48047 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -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
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index ba842c3e..e47cc464 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -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 ) \
diff --git a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
index 9cbe8931..d9cbc5ac 100644
--- a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
+++ b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
@@ -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());
@@ -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());
@@ -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") {