diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-20 20:02:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-20 20:19:08 (GMT) |
| commit | 6db713c07f2f1b14f695e123008522daf3d26527 (patch) | |
| tree | a61303680b054387d6df2cc97796d6befcf1f76e /Source/CPack | |
| parent | e72a5b2c0b51f90970fc4ef27969cee9990be862 (diff) | |
| download | CMake-6db713c07f2f1b14f695e123008522daf3d26527.zip CMake-6db713c07f2f1b14f695e123008522daf3d26527.tar.gz CMake-6db713c07f2f1b14f695e123008522daf3d26527.tar.bz2 | |
Remove use of include <cmsys/ios/*> and cmsys_ios::*
We no longer need this compatibility layer for the compilers we support.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/OSXScriptLauncher.cxx | 11 | ||||
| -rw-r--r-- | Source/CPack/cmCPackSTGZGenerator.cxx | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx index 1d7afbd..c271517 100644 --- a/Source/CPack/OSXScriptLauncher.cxx +++ b/Source/CPack/OSXScriptLauncher.cxx @@ -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); diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index e5da5cf..109dcb7 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -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"); |