kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prefer std::ostream& over derivatives as parameters

Browse Source
This commit is contained in:
Daniel Pfeifer 2016-06-08 22:29:15 +02:00
parent f9cc43ea37
commit 9f25fc4dbb
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -516,8 +516,8 @@ int cmCPackNSISGenerator::InitializeInternal()
return this->Superclass::InitializeInternal(); return this->Superclass::InitializeInternal();
} }
void cmCPackNSISGenerator::CreateMenuLinks(std::ostringstream& str, void cmCPackNSISGenerator::CreateMenuLinks(std::ostream& str,
std::ostringstream& deleteStr) std::ostream& deleteStr)
{ {
const char* cpackMenuLinks = this->GetOption("CPACK_NSIS_MENU_LINKS"); const char* cpackMenuLinks = this->GetOption("CPACK_NSIS_MENU_LINKS");
if (!cpackMenuLinks) { if (!cpackMenuLinks) {
@ -621,7 +621,7 @@ bool cmCPackNSISGenerator::SupportsComponentInstallation() const
} }
std::string cmCPackNSISGenerator::CreateComponentDescription( std::string cmCPackNSISGenerator::CreateComponentDescription(
cmCPackComponent* component, std::ostringstream& macrosOut) cmCPackComponent* component, std::ostream& macrosOut)
{ {
// Basic description of the component // Basic description of the component
std::string componentCode = "Section "; std::string componentCode = "Section ";
@ -873,7 +873,7 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription(
} }
std::string cmCPackNSISGenerator::CreateComponentGroupDescription( std::string cmCPackNSISGenerator::CreateComponentGroupDescription(
cmCPackComponentGroup* group, std::ostringstream& macrosOut) cmCPackComponentGroup* group, std::ostream& macrosOut)
{ {
if (group->Components.empty() && group->Subgroups.empty()) { if (group->Components.empty() && group->Subgroups.empty()) {
// Silently skip empty groups. NSIS doesn't support them. // Silently skip empty groups. NSIS doesn't support them.

6
Source/CPack/cmCPackNSISGenerator.h
View File

@ -40,7 +40,7 @@ public:
protected: protected:
virtual int InitializeInternal(); virtual int InitializeInternal();
void CreateMenuLinks(std::ostringstream& str, std::ostringstream& deleteStr); void CreateMenuLinks(std::ostream& str, std::ostream& deleteStr);
int PackageFiles(); int PackageFiles();
virtual const char* GetOutputExtension() { return ".exe"; } virtual const char* GetOutputExtension() { return ".exe"; }
virtual const char* GetOutputPostfix() { return "win32"; } virtual const char* GetOutputPostfix() { return "win32"; }
@ -56,7 +56,7 @@ protected:
/// particular component. Any added macros will be emitted via /// particular component. Any added macros will be emitted via
/// macrosOut. /// macrosOut.
std::string CreateComponentDescription(cmCPackComponent* component, std::string CreateComponentDescription(cmCPackComponent* component,
std::ostringstream& macrosOut); std::ostream& macrosOut);
/// Produce NSIS code that selects all of the components that this component /// Produce NSIS code that selects all of the components that this component
/// depends on, recursively. /// depends on, recursively.
@ -72,7 +72,7 @@ protected:
/// particular component group, including its components. Any /// particular component group, including its components. Any
/// added macros will be emitted via macrosOut. /// added macros will be emitted via macrosOut.
std::string CreateComponentGroupDescription(cmCPackComponentGroup* group, std::string CreateComponentGroupDescription(cmCPackComponentGroup* group,
std::ostringstream& macrosOut); std::ostream& macrosOut);
/// Translations any newlines found in the string into \\r\\n, so that the /// Translations any newlines found in the string into \\r\\n, so that the
/// resulting string can be used within NSIS. /// resulting string can be used within NSIS.

4
Source/CTest/cmCTestBatchTestHandler.cxx
View File

@ -45,7 +45,7 @@ void cmCTestBatchTestHandler::WriteBatchScript()
fout.close(); fout.close();
} }
void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout) void cmCTestBatchTestHandler::WriteSrunArgs(int test, std::ostream& fout)
{ {
cmCTestTestHandler::cmCTestTestProperties* properties = cmCTestTestHandler::cmCTestTestProperties* properties =
this->Properties[test]; this->Properties[test];
@ -73,7 +73,7 @@ void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout)
} }
} }
void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream& fout) void cmCTestBatchTestHandler::WriteTestCommand(int test, std::ostream& fout)
{ {
std::vector<std::string> args = this->Properties[test]->Args; std::vector<std::string> args = this->Properties[test]->Args;
std::vector<std::string> processArgs; std::vector<std::string> processArgs;

4
Source/CTest/cmCTestBatchTestHandler.h
View File

@ -33,8 +33,8 @@ public:
protected: protected:
void WriteBatchScript(); void WriteBatchScript();
void WriteSrunArgs(int test, cmsys::ofstream& fout); void WriteSrunArgs(int test, std::ostream& fout);
void WriteTestCommand(int test, cmsys::ofstream& fout); void WriteTestCommand(int test, std::ostream& fout);
void SubmitBatchScript(); void SubmitBatchScript();

3
Source/cmTarget.cxx
View File

@ -580,8 +580,7 @@ bool cmTarget::PushTLLCommandTrace(TLLSignature signature,
return ret; return ret;
} }
void cmTarget::GetTllSignatureTraces(std::ostringstream& s, void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const
TLLSignature sig) const
{ {
const char* sigString = const char* sigString =
(sig == cmTarget::KeywordTLLSignature ? "keyword" : "plain"); (sig == cmTarget::KeywordTLLSignature ? "keyword" : "plain");

2
Source/cmTarget.h
View File

@ -156,7 +156,7 @@ public:
}; };
bool PushTLLCommandTrace(TLLSignature signature, bool PushTLLCommandTrace(TLLSignature signature,
cmListFileContext const& lfc); cmListFileContext const& lfc);
void GetTllSignatureTraces(std::ostringstream& s, TLLSignature sig) const; void GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const;
void MergeLinkLibraries(cmMakefile& mf, const std::string& selfname, void MergeLinkLibraries(cmMakefile& mf, const std::string& selfname,
const LinkLibraryVectorType& libs); const LinkLibraryVectorType& libs);