summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-06-16 13:46:54 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-06-16 13:46:54 (GMT)
commit0e523d0612f50373486c2c2360004bb8ce859f92 (patch)
tree6194d2f6871bda094e9eb86a0a1f29ce9644f2a5 /Source/cmMakefile.cxx
parent993991a07de48079233b3a04902a1f34ddfb97df (diff)
parented5fa48d50ea0605b47598ff5b1d765548e8d638 (diff)
downloadCMake-0e523d0612f50373486c2c2360004bb8ce859f92.zip
CMake-0e523d0612f50373486c2c2360004bb8ce859f92.tar.gz
CMake-0e523d0612f50373486c2c2360004bb8ce859f92.tar.bz2
Merge topic 'cleanup-streams'
ed5fa48d cmXMLWriter: use ifstream from KWSys 24ab29b8 Prefer istringstream and ostringstream over stringstream. ab8b77dd Remove redundant arguments from fstream constructors eb79fa72 Access std::ios_base with std::ios
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 75d57b5..5712070 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3459,7 +3459,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
}
} else {
std::string newLineCharacters;
- std::ios_base::openmode omode = std::ios_base::out | std::ios_base::trunc;
+ std::ios::openmode omode = std::ios::out | std::ios::trunc;
if (newLine.IsValid()) {
newLineCharacters = newLine.GetCharacters();
omode |= std::ios::binary;