diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-07 14:39:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-07 14:39:17 (GMT) |
| commit | 3a024ce0d8aeec991297b7997a872093176e373e (patch) | |
| tree | a9f0f79d5ae489ccb3d352ce71f1d0f8c81354aa /Source/cmGlobalGenerator.cxx | |
| parent | 91dcc9bef390f6644e1a357ed2226f350742f49b (diff) | |
| parent | 5730710c86e5b844c48e17e9001647ae0aa841a3 (diff) | |
| download | CMake-3a024ce0d8aeec991297b7997a872093176e373e.zip CMake-3a024ce0d8aeec991297b7997a872093176e373e.tar.gz CMake-3a024ce0d8aeec991297b7997a872093176e373e.tar.bz2 | |
Merge topic 'unicode-fstream'
5730710 Use cmsys::[io]fstream instead of cmsys_ios::[io]fstream.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index eef8d6d..82c9155 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -30,6 +30,7 @@ #include "cmExportBuildFileGenerator.h" #include <cmsys/Directory.hxx> +#include <cmsys/FStream.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) # include <cmsys/MD5.h> @@ -2749,9 +2750,9 @@ void cmGlobalGenerator::CheckRuleHashes(std::string const& pfile, std::string const& home) { #if defined(_WIN32) || defined(__CYGWIN__) - std::ifstream fin(pfile.c_str(), std::ios::in | std::ios::binary); + cmsys::ifstream fin(pfile.c_str(), std::ios::in | std::ios::binary); #else - std::ifstream fin(pfile.c_str(), std::ios::in); + cmsys::ifstream fin(pfile.c_str(), std::ios::in); #endif if(!fin) { |