diff options
| author | Chris Thrasher | 2025-09-21 18:05:21 -0600 |
|---|---|---|
| committer | Chris Thrasher | 2025-09-22 11:50:44 -0600 |
| commit | 8efee9b7632e6dd014b5b041ee326eef7d0b09e6 (patch) | |
| tree | fbc1657a5d7d414fbe93a412990bcf5cfb2df438 | |
| parent | a5735af2f7d956600250541d289c552ace7e87ae (diff) | |
| download | catch3-devel-c++17.tar.gz | |
Use std::string_viewdevel-c++17
119 files changed, 913 insertions, 3430 deletions
diff --git a/docs/reporter-events.md b/docs/reporter-events.md index 015f67be..a9ed40cf 100644 --- a/docs/reporter-events.md +++ b/docs/reporter-events.md @@ -109,10 +109,10 @@ and then `assertionEnded` event is emitted. > [Introduced](https://github.com/catchorg/Catch2/issues/1616) in Catch2 2.9.0. ```cpp -void benchmarkPreparing( StringRef name ) override; +void benchmarkPreparing( std::string_view name ) override; void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override; void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override; -void benchmarkFailed( StringRef error ) override; +void benchmarkFailed( std::string_view error ) override; ``` Due to the benchmark lifecycle being bit more complicated, the benchmarking @@ -153,9 +153,9 @@ void listTags( std::vector<TagInfo> const& tagInfos ); ## Miscellaneous events ```cpp -void reportInvalidTestSpec( StringRef unmatchedSpec ); -void fatalErrorEncountered( StringRef error ); -void noMatchingTestCases( StringRef unmatchedSpec ); +void reportInvalidTestSpec( std::string_view unmatchedSpec ); +void fatalErrorEncountered( std::string_view error ); +void noMatchingTestCases( std::string_view unmatchedSpec ); ``` These are one-off events that do not neatly fit into other categories. diff --git a/examples/210-Evt-EventListeners.cpp b/examples/210-Evt-EventListeners.cpp index 26d5c62c..8550e179 100644 --- a/examples/210-Evt-EventListeners.cpp +++ b/examples/210-Evt-EventListeners.cpp @@ -131,7 +131,7 @@ void print( std::ostream& os, int const level, std::string const& title, Catch:: } // struct Tag { -// StringRef original, lowerCased; +// std::string_view original, lowerCased; // }; // // @@ -221,9 +221,9 @@ void print( std::ostream& os, int const level, std::string const& title, Catch:: // struct AssertionInfo // { -// StringRef macroName; +// std::string_view macroName; // SourceLineInfo lineInfo; -// StringRef capturedExpression; +// std::string_view capturedExpression; // ResultDisposition::Flags resultDisposition; // }; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1b5a7a8b..7c29add5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,7 +124,6 @@ set(IMPL_HEADERS ${SOURCES_DIR}/internal/catch_stdstreams.hpp ${SOURCES_DIR}/internal/catch_stream_end_stop.hpp ${SOURCES_DIR}/internal/catch_string_manip.hpp - ${SOURCES_DIR}/internal/catch_stringref.hpp ${SOURCES_DIR}/internal/catch_tag_alias_registry.hpp ${SOURCES_DIR}/internal/catch_template_test_registry.hpp ${SOURCES_DIR}/internal/catch_test_case_info_hasher.hpp @@ -201,7 +200,6 @@ set(IMPL_SOURCES ${SOURCES_DIR}/internal/catch_startup_exception_registry.cpp ${SOURCES_DIR}/internal/catch_stdstreams.cpp ${SOURCES_DIR}/internal/catch_string_manip.cpp - ${SOURCES_DIR}/internal/catch_stringref.cpp ${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp ${SOURCES_DIR}/internal/catch_test_case_info_hasher.cpp ${SOURCES_DIR}/internal/catch_test_case_registry_impl.cpp diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index 4c9ea994..d948e126 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -106,7 +106,6 @@ #include <catch2/internal/catch_stdstreams.hpp> #include <catch2/internal/catch_stream_end_stop.hpp> #include <catch2/internal/catch_string_manip.hpp> -#include <catch2/internal/catch_stringref.hpp> #include <catch2/internal/catch_tag_alias_registry.hpp> #include <catch2/internal/catch_template_test_registry.hpp> #include <catch2/internal/catch_test_case_info_hasher.hpp> diff --git a/src/catch2/catch_assertion_info.hpp b/src/catch2/catch_assertion_info.hpp index 9d2f91fa..b64ad74b 100644 --- a/src/catch2/catch_assertion_info.hpp +++ b/src/catch2/catch_assertion_info.hpp @@ -10,16 +10,17 @@ #include <catch2/internal/catch_result_type.hpp> #include < |