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

Remove use of include <cmsys/ios/*> and cmsys_ios::* 

We no longer need this compatibility layer for the compilers we support.
This commit is contained in:
Brad King 2015-08-20 16:02:20 -04:00
parent e72a5b2c0b
commit 6db713c07f
14 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/CPack/OSXScriptLauncher.cxx
View File

@ -11,17 +11,18 @@
============================================================================*/
#include <cmsys/SystemTools.hxx>
#include <cmsys/Process.h>
#include <cmsys/ios/iostream>
#include <cmsys/FStream.hxx>
#include <iostream>
#include <CoreFoundation/CoreFoundation.h>
// For the PATH_MAX constant
#include <sys/syslimits.h>
#define DebugError(x) \
ofs << x << cmsys_ios::endl; \
cmsys_ios::cout << x << cmsys_ios::endl
ofs << x << std::endl; \
std::cout << x << std::endl
int main(int argc, char* argv[])
{
@ -77,7 +78,7 @@ int main(int argc, char* argv[])
std::string scriptDirectory = cmsys::SystemTools::GetFilenamePath(
fullScriptPath);
ofs << fullScriptPath.c_str() << cmsys_ios::endl;
ofs << fullScriptPath.c_str() << std::endl;
std::vector<const char*> args;
args.push_back(fullScriptPath.c_str());
int cc;
@ -109,7 +110,7 @@ int main(int argc, char* argv[])
data[i] = ' ';
}
}
cmsys_ios::cout.write(data, length);
std::cout.write(data, length);
}
cmsysProcess_WaitForExit(cp, 0);

3
Source/CPack/cmCPackSTGZGenerator.cxx
View File

@ -19,7 +19,6 @@
#include "cmMakefile.h"
#include "cmCPackLog.h"
#include <cmsys/ios/sstream>
#include <cmsys/FStream.hxx>
#include <sys/types.h>
#include <sys/stat.h>
@ -85,7 +84,7 @@ int cmCPackSTGZGenerator::PackageFiles()
int cmCPackSTGZGenerator::GenerateHeader(std::ostream* os)
{
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Writing header" << std::endl);
cmsys_ios::ostringstream str;
std::ostringstream str;
int counter = 0;
std::string inLicFile = this->GetOption("CPACK_RESOURCE_FILE_LICENSE");

1
Source/CTest/cmCTestGIT.cxx
View File

@ -17,7 +17,6 @@
#include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
#include <cmsys/ios/sstream>
#include <cmsys/Process.h>
#include <cmsys/FStream.hxx>

1
Source/CTest/cmCTestP4.cxx
View File

@ -16,7 +16,6 @@
#include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
#include <cmsys/ios/sstream>
#include <cmsys/Process.h>
#include <sys/types.h>

7
Source/cmArchiveWrite.cxx
View File

@ -13,7 +13,6 @@
#include "cmSystemTools.h"
#include "cmLocale.h"
#include <cmsys/ios/iostream>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
#include <cm_libarchive.h>
@ -67,7 +66,7 @@ struct cmArchiveWrite::Callback
{
cmArchiveWrite* self = static_cast<cmArchiveWrite*>(cd);
if(self->Stream.write(static_cast<const char*>(b),
static_cast<cmsys_ios::streamsize>(n)))
static_cast<std::streamsize>(n)))
{
return static_cast<__LA_SSIZE_T>(n);
}
@ -313,7 +312,7 @@ bool cmArchiveWrite::AddFile(const char* file,
//----------------------------------------------------------------------------
bool cmArchiveWrite::AddData(const char* file, size_t size)
{
cmsys::ifstream fin(file, std::ios::in | cmsys_ios_binary);
cmsys::ifstream fin(file, std::ios::in | std::ios::binary);
if(!fin)
{
this->Error = "Error opening \"";
@ -327,7 +326,7 @@ bool cmArchiveWrite::AddData(const char* file, size_t size)
size_t nleft = size;
while(nleft > 0)
{
typedef cmsys_ios::streamsize ssize_type;
typedef std::streamsize ssize_type;
size_t const nnext = nleft > sizeof(buffer)? sizeof(buffer) : nleft;
ssize_type const nnext_s = static_cast<ssize_type>(nnext);
fin.read(buffer, nnext_s);

4
Source/cmCMakeHostSystemInformationCommand.cxx
View File

@ -11,8 +11,6 @@
============================================================================*/
#include "cmCMakeHostSystemInformationCommand.h"
#include <cmsys/ios/sstream>
// cmCMakeHostSystemInformation
bool cmCMakeHostSystemInformationCommand
::InitialPass(std::vector<std::string> const &args, cmExecutionStatus &)
@ -107,7 +105,7 @@ bool cmCMakeHostSystemInformationCommand
std::string cmCMakeHostSystemInformationCommand
::ValueToString(size_t value) const
{
cmsys_ios::stringstream tmp;
std::stringstream tmp;
tmp << value;
return tmp.str();
}

2
Source/cmCryptoHash.cxx
View File

@ -46,7 +46,7 @@ std::string cmCryptoHash::HashString(const std::string& input)
//----------------------------------------------------------------------------
std::string cmCryptoHash::HashFile(const std::string& file)
{
cmsys::ifstream fin(file.c_str(), std::ios::in | cmsys_ios_binary);
cmsys::ifstream fin(file.c_str(), std::ios::in | std::ios::binary);
if(!fin)
{
return "";

2
Source/cmFindPackageCommand.cxx
View File

@ -1378,7 +1378,7 @@ void cmFindPackageCommand::LoadPackageRegistryDir(std::string const& dir,
cmFindPackageCommandHoldFile holdFile(fname.c_str());
// Load the file.
cmsys::ifstream fin(fname.c_str(), std::ios::in | cmsys_ios_binary);
cmsys::ifstream fin(fname.c_str(), std::ios::in | std::ios::binary);
std::string fentry;
if(fin && cmSystemTools::GetLineFromStream(fin, fentry) &&
this->CheckPackageRegistryEntry(fentry, outPaths))

5
Source/cmQtAutoGenerators.cxx
View File

@ -26,7 +26,6 @@
#include <sys/stat.h>
#include <cmsys/Terminal.h>
#include <cmsys/ios/sstream>
#include <cmsys/FStream.hxx>
#include <assert.h>
@ -122,7 +121,7 @@ static void copyTargetProperty(cmTarget* destinationTarget,
static std::string ReadAll(const std::string& filename)
{
cmsys::ifstream file(filename.c_str());
cmsys_ios::stringstream stream;
std::stringstream stream;
stream << file.rdbuf();
file.close();
return stream.str();
@ -1640,7 +1639,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
this->GenerateQrc();
}
cmsys_ios::stringstream outStream;
std::stringstream outStream;
outStream << "/* This file is autogenerated, do not edit*/\n";
bool automocCppChanged = false;

2
Source/cmSystemTools.cxx
View File

@ -1482,7 +1482,7 @@ bool cmSystemTools::CreateTar(const char* outFileName,
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
cmsys::ofstream fout(outFileName, std::ios::out | cmsys_ios_binary);
cmsys::ofstream fout(outFileName, std::ios::out | std::ios::binary);
if(!fout)
{
std::string e = "Cannot open output file \"";

8
Source/cmXMLSafe.cxx
View File

@ -13,8 +13,8 @@
#include "cm_utf8.h"
#include <cmsys/ios/iostream>
#include <cmsys/ios/sstream>
#include <iostream>
#include <sstream>
#include <string.h>
#include <stdio.h>
@ -45,13 +45,13 @@ cmXMLSafe& cmXMLSafe::Quotes(bool b)
//----------------------------------------------------------------------------
std::string cmXMLSafe::str()
{
cmsys_ios::ostringstream ss;
std::ostringstream ss;
ss << *this;
return ss.str();
}
//----------------------------------------------------------------------------
cmsys_ios::ostream& operator<<(cmsys_ios::ostream& os, cmXMLSafe const& self)
std::ostream& operator<<(std::ostream& os, cmXMLSafe const& self)
{
char const* first = self.Data;
char const* last = self.Data + self.Size;

5
Source/cmXMLSafe.h
View File

@ -13,7 +13,7 @@
#define cmXMLSafe_h
#include <cmsys/stl/string>
#include <cmsys/ios/iosfwd>
#include <iosfwd>
/** \class cmXMLSafe
* \brief Write strings to XML with proper escapes
@ -37,8 +37,7 @@ private:
char const* Data;
unsigned long Size;
bool DoQuotes;
friend cmsys_ios::ostream& operator<<(cmsys_ios::ostream&,
cmXMLSafe const&);
friend std::ostream& operator<<(std::ostream&, cmXMLSafe const&);
};
#endif

60
Tests/CMakeLib/testVisualStudioSlnParser.cxx
View File

@ -3,7 +3,7 @@
#include "cmVisualStudioSlnData.h"
#include "cmVisualStudioSlnParser.h"
#include <cmsys/ios/iostream>
#include <iostream>
//----------------------------------------------------------------------------
static bool parsedRight(cmVisualStudioSlnParser& parser,
@ -27,10 +27,10 @@ static bool parsedRight(cmVisualStudioSlnParser& parser,
return true;
}
}
cmsys_ios::cerr << "cmVisualStudioSlnParser mis-parsed " << file
<< "." SLN_EXTENSION << "; expected result " << expected
<< ", got " << parser.GetParseResult()
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser mis-parsed " << file
<< "." SLN_EXTENSION << "; expected result " << expected
<< ", got " << parser.GetParseResult()
<< std::endl;
return false;
}
@ -42,8 +42,8 @@ int testVisualStudioSlnParser(int, char*[])
// Test clean parser
if (parser.GetParseResult() != cmVisualStudioSlnParser::ResultOK)
{
cmsys_ios::cerr << "cmVisualStudioSlnParser initialisation failed"
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser initialisation failed"
<< std::endl;
return 1;
}
@ -73,38 +73,38 @@ int testVisualStudioSlnParser(int, char*[])
const size_t expectedProjectCount = sizeof(names) / sizeof(*names);
if (projects.size() != expectedProjectCount)
{
cmsys_ios::cerr << "cmVisualStudioSlnParser returned bad number of "
<< "projects (" << projects.size() << " instead of "
<< expectedProjectCount << ')'
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser returned bad number of "
<< "projects (" << projects.size() << " instead of "
<< expectedProjectCount << ')'
<< std::endl;
return 1;
}
for (size_t idx = 0; idx < expectedProjectCount; ++idx)
{
if (projects[idx].GetName() != names[idx])
{
cmsys_ios::cerr << "cmVisualStudioSlnParser returned bad project #"
<< idx << "; expected \"" << names[idx] << "\", got \""
<< projects[idx].GetName() << '"'
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser returned bad project #"
<< idx << "; expected \"" << names[idx] << "\", got \""
<< projects[idx].GetName() << '"'
<< std::endl;
return 1;
}
}
if (projects[0].GetRelativePath() != "Utilities\\3rdParty")
{
cmsys_ios::cerr << "cmVisualStudioSlnParser returned bad relative path of "
<< "project 3rdParty; expected \"Utilities\\3rdParty\", "
<< "got \"" << projects[0].GetRelativePath() << '"'
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser returned bad relative path of "
<< "project 3rdParty; expected \"Utilities\\3rdParty\", "
<< "got \"" << projects[0].GetRelativePath() << '"'
<< std::endl;
return 1;
}
if (projects[2].GetGUID() != "{59BCCCCD-3AD1-4491-B8F4-C5793AC007E2}")
{
cmsys_ios::cerr << "cmVisualStudioSlnParser returned bad relative path of "
<< "project CMakeLib; expected "
<< "\"{59BCCCCD-3AD1-4491-B8F4-C5793AC007E2}\", "
<< "got \"" << projects[2].GetGUID() << '"'
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser returned bad relative path of "
<< "project CMakeLib; expected "
<< "\"{59BCCCCD-3AD1-4491-B8F4-C5793AC007E2}\", "
<< "got \"" << projects[2].GetGUID() << '"'
<< std::endl;
return 1;
}
}
@ -119,9 +119,9 @@ int testVisualStudioSlnParser(int, char*[])
}
if (!parser.GetParseHadBOM())
{
cmsys_ios::cerr << "cmVisualStudioSlnParser didn't find BOM in bom."
<< SLN_EXTENSION
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser didn't find BOM in bom."
<< SLN_EXTENSION
<< std::endl;
return 1;
}
@ -131,9 +131,9 @@ int testVisualStudioSlnParser(int, char*[])
}
if (parser.GetParseHadBOM())
{
cmsys_ios::cerr << "cmVisualStudioSlnParser found BOM in nobom."
<< SLN_EXTENSION
<< cmsys_ios::endl;
std::cerr << "cmVisualStudioSlnParser found BOM in nobom."
<< SLN_EXTENSION
<< std::endl;
return 1;
}
}

4
Tests/CMakeLib/testXMLParser.cxx
View File

@ -2,7 +2,7 @@
#include "cmXMLParser.h"
#include <cmsys/ios/iostream>
#include <iostream>
int testXMLParser(int, char*[])
{
@ -10,7 +10,7 @@ int testXMLParser(int, char*[])
cmXMLParser parser;
if(!parser.ParseFile(SOURCE_DIR "/testXMLParser.xml"))
{
cmsys_ios::cerr << "cmXMLParser failed!" << cmsys_ios::endl;
std::cerr << "cmXMLParser failed!" << std::endl;
return 1;
}
return 0;