3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 04:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Wold-style-cast error (#2125)

Browse Source 
* Add Wold-style-cast to cmake flags
* Fix old style cast in catch_stats.hpp
* Fix old style cast in catch_stats.cpp
This commit is contained in:
Roman Proskuryakov
2020-12-28 16:00:19 +03:00
committed by GitHub
parent 045feff834
commit 0acb371b92
9 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/SelfTest/Baselines/compact.sw.approved.txt
View File

@@ -1342,7 +1342,7 @@ String.tests.cpp:<line number>: passed: s.data() == ss.data() for: "hello world!
String.tests.cpp:<line number>: passed: s.substr(s.size() + 1, 123).empty() for: true
String.tests.cpp:<line number>: passed: std::strcmp(ss.c_str(), "world!") == 0 for: 0 == 0
String.tests.cpp:<line number>: passed: s.substr(1'000'000, 1).empty() for: true
String.tests.cpp:<line number>: passed: (char*)buffer1 != (char*)buffer2 for: "Hello" != "Hello"
String.tests.cpp:<line number>: passed: reinterpret_cast<char*>(buffer1) != reinterpret_cast<char*>(buffer2) for: "Hello" != "Hello"
String.tests.cpp:<line number>: passed: left == right for: Hello == Hello
String.tests.cpp:<line number>: passed: left != left.substr(0, 3) for: Hello != Hel
String.tests.cpp:<line number>: passed: sr == "a standard string" for: a standard string == "a standard string"

2
tests/SelfTest/Baselines/console.sw.approved.txt
View File

@@ -9968,7 +9968,7 @@ String.tests.cpp:<line number>
...............................................................................
String.tests.cpp:<line number>: PASSED:
CHECK( (char*)buffer1 != (char*)buffer2 )
CHECK( reinterpret_cast<char*>(buffer1) != reinterpret_cast<char*>(buffer2) )
with expansion:
"Hello" != "Hello"

2
tests/SelfTest/Baselines/tap.sw.approved.txt
View File

@@ -2598,7 +2598,7 @@ ok {test-number} - std::strcmp(ss.c_str(), "world!") == 0 for: 0 == 0
# StringRef
ok {test-number} - s.substr(1'000'000, 1).empty() for: true
# StringRef
ok {test-number} - (char*)buffer1 != (char*)buffer2 for: "Hello" != "Hello"
ok {test-number} - reinterpret_cast<char*>(buffer1) != reinterpret_cast<char*>(buffer2) for: "Hello" != "Hello"
# StringRef
ok {test-number} - left == right for: Hello == Hello
# StringRef

2
tests/SelfTest/Baselines/xml.sw.approved.txt
View File

@@ -12133,7 +12133,7 @@ Message from section two
<Section name="Comparisons are deep" filename="tests/<exe-name>/IntrospectiveTests/String.tests.cpp" >
<Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/String.tests.cpp" >
<Original>
(char*)buffer1 != (char*)buffer2
reinterpret_cast&lt;char*>(buffer1) != reinterpret_cast&lt;char*>(buffer2)
</Original>
<Expanded>
"Hello" != "Hello"

2
tests/SelfTest/IntrospectiveTests/String.tests.cpp
View File

@@ -79,7 +79,7 @@ TEST_CASE( "StringRef", "[Strings][StringRef]" ) {
SECTION( "Comparisons are deep" ) {
char buffer1[] = "Hello";
char buffer2[] = "Hello";
CHECK((char*)buffer1 != (char*)buffer2);
CHECK(reinterpret_cast<char*>(buffer1) != reinterpret_cast<char*>(buffer2));
StringRef left(buffer1), right(buffer2);
REQUIRE( left == right );

2
tests/SelfTest/IntrospectiveTests/Xml.tests.cpp
View File

@@ -41,7 +41,7 @@ TEST_CASE( "XmlEncode", "[XML]" ) {
// Thanks to Peter Bindels (dascandy) for some of the tests
TEST_CASE("XmlEncode: UTF-8", "[XML][UTF-8][approvals]") {
#define ESC(lit) (char*)(lit)
#define ESC(lit) reinterpret_cast<const char*>(lit)
SECTION("Valid utf-8 strings") {
CHECK(encode(ESC(u8"Here be 👾")) == ESC(u8"Here be 👾"));
CHECK(encode(ESC(u8"šš")) == ESC(u8"šš"));