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/cmArchiveWrite.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/cmArchiveWrite.cxx')
| -rw-r--r-- | Source/cmArchiveWrite.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index b410e44..d5dcd6a 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -14,6 +14,7 @@ #include "cmSystemTools.h" #include <cmsys/ios/iostream> #include <cmsys/Directory.hxx> +#include <cmsys/FStream.hxx> #include <cm_libarchive.h> //---------------------------------------------------------------------------- @@ -263,7 +264,7 @@ bool cmArchiveWrite::AddFile(const char* file, //---------------------------------------------------------------------------- bool cmArchiveWrite::AddData(const char* file, size_t size) { - std::ifstream fin(file, std::ios::in | cmsys_ios_binary); + cmsys::ifstream fin(file, std::ios::in | cmsys_ios_binary); if(!fin) { this->Error = "Error opening \""; |