diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmAlgorithms.h | 8 | ||||
| -rw-r--r-- | Source/cmCTest.h | 2 | ||||
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.h | 6 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmProcessOutput.cxx | 13 | ||||
| -rw-r--r-- | Source/cmProcessOutput.h | 2 |
6 files changed, 19 insertions, 14 deletions
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index 22f69fa4ef..7c683adf00 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -242,7 +242,7 @@ std::string cmJoin(Range const& r, const char* delimiter) } template <typename Range> -std::string cmJoin(Range const& r, std::string delimiter) +std::string cmJoin(Range const& r, std::string const& delimiter) { return cmJoin(r, delimiter.c_str()); } @@ -344,13 +344,13 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r) } template <typename Range> -std::string cmWrap(std::string prefix, Range const& r, std::string suffix, - std::string sep) +std::string cmWrap(std::string const& prefix, Range const& r, + std::string const& suffix, std::string const& sep) { if (r.empty()) { return std::string(); } - return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix; + return prefix + cmJoin(r, suffix + sep + prefix) + suffix; } template <typename Range> diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 8db2e5f4bc..8fc646f62e 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -242,7 +242,7 @@ public: /** Used for parallel ctest job scheduling */ std::string GetScheduleType() { return this->ScheduleType; } - void SetScheduleType(std::string type) { this->ScheduleType = type; } + void SetScheduleType(std::string const& type) { this->ScheduleType = type; } /** The max output width */ int GetMaxTestNameWidth() const; diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index 122e9cf571..41bea9bcb1 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -65,13 +65,15 @@ private: struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator { GeneratorExpressionContent(const char* startContent, size_t length); - void SetIdentifier(std::vector<cmGeneratorExpressionEvaluator*> identifier) + void SetIdentifier( + std::vector<cmGeneratorExpressionEvaluator*> const& identifier) { this->IdentifierChildren = identifier; } void SetParameters( - std::vector<std::vector<cmGeneratorExpressionEvaluator*> > parameters) + std::vector<std::vector<cmGeneratorExpressionEvaluator*> > const& + parameters) { this->ParamChildren = parameters; } diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index fdca78afa0..901ca35418 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -148,7 +148,7 @@ public: void AppendDefines(std::set<std::string>& defines, const char* defines_list) const; void AppendDefines(std::set<std::string>& defines, - std::string defines_list) const + std::string const& defines_list) const { this->AppendDefines(defines, defines_list.c_str()); } diff --git a/Source/cmProcessOutput.cxx b/Source/cmProcessOutput.cxx index 8b4d0e1c2a..617e1ca7d6 100644 --- a/Source/cmProcessOutput.cxx +++ b/Source/cmProcessOutput.cxx @@ -9,7 +9,8 @@ unsigned int cmProcessOutput::defaultCodepage = KWSYS_ENCODING_DEFAULT_CODEPAGE; #endif -cmProcessOutput::Encoding cmProcessOutput::FindEncoding(std::string name) +cmProcessOutput::Encoding cmProcessOutput::FindEncoding( + std::string const& name) { Encoding encoding = Auto; if (name == "UTF8") { @@ -54,9 +55,13 @@ cmProcessOutput::~cmProcessOutput() bool cmProcessOutput::DecodeText(std::string raw, std::string& decoded, size_t id) { +#if !defined(_WIN32) + static_cast<void>(id); + decoded.swap(raw); + return true; +#else bool success = true; decoded = raw; -#if defined(_WIN32) if (id > 0) { if (rawparts.size() < id) { rawparts.reserve(id); @@ -113,10 +118,8 @@ bool cmProcessOutput::DecodeText(std::string raw, std::string& decoded, success = DoDecodeText(raw, decoded, NULL); } } -#else - static_cast<void>(id); -#endif return success; +#endif } bool cmProcessOutput::DecodeText(const char* data, size_t length, diff --git a/Source/cmProcessOutput.h b/Source/cmProcessOutput.h index 6046f57260..d2e631f88c 100644 --- a/Source/cmProcessOutput.h +++ b/Source/cmProcessOutput.h @@ -32,7 +32,7 @@ public: * \param name a encoding name. * \return encoding enum value or Auto if \a name was not found. */ - static Encoding FindEncoding(std::string name); + static Encoding FindEncoding(std::string const& name); /// The code page that is used as internal encoding to which we will encode. static unsigned int defaultCodepage; |