From fa0e5906ffc4a1d5fc85ef1b3398cb57b6d544be Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Tue, 15 Jul 2025 18:24:58 +0200 Subject: [PATCH] source: Pass cmStringRange by value --- Source/cmCoreTryCompile.cxx | 2 +- Source/cmCoreTryCompile.h | 7 +++---- Source/cmDebuggerVariablesHelper.cxx | 3 +-- Source/cmDebuggerVariablesHelper.h | 2 +- Source/cmStringAlgorithms.cxx | 2 +- Source/cmStringAlgorithms.h | 2 +- Source/cmTarget.cxx | 5 ++--- Source/cmTarget.h | 4 ++-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 4a2f163a0a..721f29ff81 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -236,7 +236,7 @@ ArgumentParser::Continue cmCoreTryCompile::Arguments::SetSourceType( } Arguments cmCoreTryCompile::ParseArgs( - cmRange::const_iterator> const& args, + cmRange::const_iterator> args, cmArgumentParser const& parser, std::vector& unparsedArguments) { diff --git a/Source/cmCoreTryCompile.h b/Source/cmCoreTryCompile.h index 41d712fb05..3c364569b4 100644 --- a/Source/cmCoreTryCompile.h +++ b/Source/cmCoreTryCompile.h @@ -161,8 +161,7 @@ private: std::string WriteSource(std::string const& name, std::string const& content, char const* command) const; - Arguments ParseArgs( - cmRange::const_iterator> const& args, - cmArgumentParser const& parser, - std::vector& unparsedArguments); + Arguments ParseArgs(cmRange::const_iterator> args, + cmArgumentParser const& parser, + std::vector& unparsedArguments); }; diff --git a/Source/cmDebuggerVariablesHelper.cxx b/Source/cmDebuggerVariablesHelper.cxx index b8bc328231..efe5c896d9 100644 --- a/Source/cmDebuggerVariablesHelper.cxx +++ b/Source/cmDebuggerVariablesHelper.cxx @@ -83,8 +83,7 @@ std::shared_ptr cmDebuggerVariablesHelper::CreateIfAny( std::shared_ptr cmDebuggerVariablesHelper::CreateIfAny( std::shared_ptr const& variablesManager, - std::string const& name, bool supportsVariableType, - cmBTStringRange const& entries) + std::string const& name, bool supportsVariableType, cmBTStringRange entries) { if (entries.empty()) { return {}; diff --git a/Source/cmDebuggerVariablesHelper.h b/Source/cmDebuggerVariablesHelper.h index e39a857da3..0e0fdb4b1b 100644 --- a/Source/cmDebuggerVariablesHelper.h +++ b/Source/cmDebuggerVariablesHelper.h @@ -48,7 +48,7 @@ public: static std::shared_ptr CreateIfAny( std::shared_ptr const& variablesManager, std::string const& name, bool supportsVariableType, - cmBTStringRange const& entries); + cmBTStringRange entries); static std::shared_ptr CreateIfAny( std::shared_ptr const& variablesManager, diff --git a/Source/cmStringAlgorithms.cxx b/Source/cmStringAlgorithms.cxx index a64bfc87ce..df3b7d9c6d 100644 --- a/Source/cmStringAlgorithms.cxx +++ b/Source/cmStringAlgorithms.cxx @@ -230,7 +230,7 @@ std::string cmJoin(std::vector const& rng, return cmJoinStrings(rng, separator, initial); } -std::string cmJoin(cmStringRange const& rng, cm::string_view separator, +std::string cmJoin(cmStringRange rng, cm::string_view separator, cm::string_view initial) { return cmJoinStrings(rng, separator, initial); diff --git a/Source/cmStringAlgorithms.h b/Source/cmStringAlgorithms.h index 3bf6022312..314124e409 100644 --- a/Source/cmStringAlgorithms.h +++ b/Source/cmStringAlgorithms.h @@ -126,7 +126,7 @@ std::string cmJoinStrings(Range const& rng, cm::string_view separator, std::string cmJoin(std::vector const& rng, cm::string_view separator, cm::string_view initial = {}); -std::string cmJoin(cmStringRange const& rng, cm::string_view separator, +std::string cmJoin(cmStringRange rng, cm::string_view separator, cm::string_view initial = {}); enum class cmTokenizerMode diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index d87fd7c41f..cbf8b90736 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1626,7 +1626,7 @@ std::set const& cmTarget::GetSystemIncludeDirectories() const } void cmTarget::AddInstallIncludeDirectories(cmTargetExport const& te, - cmStringRange const& incs) + cmStringRange incs) { std::copy( incs.begin(), incs.end(), @@ -2403,8 +2403,7 @@ bool CheckLinkLibraryPattern(UsageRequirementProperty const& usage, } } -void cmTarget::FinalizeTargetConfiguration( - cmBTStringRange const& compileDefinitions) +void cmTarget::FinalizeTargetConfiguration(cmBTStringRange compileDefinitions) { if (this->GetType() == cmStateEnums::GLOBAL_TARGET) { return; diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 4d75f45d3e..1c2a9b2e07 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -272,7 +272,7 @@ public: void InsertPrecompileHeader(BT const& entry); void AppendBuildInterfaceIncludes(); - void FinalizeTargetConfiguration(cmBTStringRange const& compileDefinitions); + void FinalizeTargetConfiguration(cmBTStringRange compileDefinitions); std::string GetDebugGeneratorExpressions(std::string const& value, cmTargetLinkLibraryType llt) const; @@ -281,7 +281,7 @@ public: std::set const& GetSystemIncludeDirectories() const; void AddInstallIncludeDirectories(cmTargetExport const& te, - cmStringRange const& incs); + cmStringRange incs); cmStringRange GetInstallIncludeDirectoriesEntries( cmTargetExport const& te) const;