mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 12:17:11 +01:00 
			
		
		
		
	Add lifetime annotations to more places using StringRef
This commit is contained in:
		| @@ -8,6 +8,7 @@ | ||||
| #ifndef CATCH_STRING_MANIP_HPP_INCLUDED | ||||
| #define CATCH_STRING_MANIP_HPP_INCLUDED | ||||
|  | ||||
| #include <catch2/internal/catch_lifetimebound.hpp> | ||||
| #include <catch2/internal/catch_stringref.hpp> | ||||
|  | ||||
| #include <cstdint> | ||||
| @@ -28,10 +29,10 @@ namespace Catch { | ||||
|     //! Returns a new string without whitespace at the start/end | ||||
|     std::string trim( std::string const& str ); | ||||
|     //! Returns a substring of the original ref without whitespace. Beware lifetimes! | ||||
|     StringRef trim(StringRef ref); | ||||
|     StringRef trim( StringRef ref CATCH_ATTR_LIFETIMEBOUND ); | ||||
|  | ||||
|     // !!! Be aware, returns refs into original string - make sure original string outlives them | ||||
|     std::vector<StringRef> splitStringRef( StringRef str, char delimiter ); | ||||
|     std::vector<StringRef> splitStringRef( StringRef str CATCH_ATTR_LIFETIMEBOUND, char delimiter ); | ||||
|     bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ); | ||||
|  | ||||
|     /** | ||||
| @@ -49,7 +50,7 @@ namespace Catch { | ||||
|         StringRef m_label; | ||||
|  | ||||
|     public: | ||||
|         constexpr pluralise(std::uint64_t count, StringRef label): | ||||
|         constexpr pluralise(std::uint64_t count, StringRef label CATCH_ATTR_LIFETIMEBOUND): | ||||
|             m_count(count), | ||||
|             m_label(label) | ||||
|         {} | ||||
|   | ||||
| @@ -8,6 +8,7 @@ | ||||
| #ifndef CATCH_TEST_CASE_TRACKER_HPP_INCLUDED | ||||
| #define CATCH_TEST_CASE_TRACKER_HPP_INCLUDED | ||||
|  | ||||
| #include <catch2/internal/catch_lifetimebound.hpp> | ||||
| #include <catch2/internal/catch_source_line_info.hpp> | ||||
| #include <catch2/internal/catch_unique_ptr.hpp> | ||||
| #include <catch2/internal/catch_stringref.hpp> | ||||
| @@ -48,7 +49,7 @@ namespace TestCaseTracking { | ||||
|         StringRef name; | ||||
|         SourceLineInfo location; | ||||
|  | ||||
|         constexpr NameAndLocationRef( StringRef name_, | ||||
|         constexpr NameAndLocationRef( StringRef name_ CATCH_ATTR_LIFETIMEBOUND, | ||||
|                                       SourceLineInfo location_ ): | ||||
|             name( name_ ), location( location_ ) {} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský