summaryrefslogtreecommitdiffstats
path: root/Source/cmArchiveWrite.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-20 20:02:20 (GMT)
committerBrad King <brad.king@kitware.com>2015-08-20 20:19:08 (GMT)
commit6db713c07f2f1b14f695e123008522daf3d26527 (patch)
treea61303680b054387d6df2cc97796d6befcf1f76e /Source/cmArchiveWrite.cxx
parente72a5b2c0b51f90970fc4ef27969cee9990be862 (diff)
downloadCMake-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/cmArchiveWrite.cxx')
-rw-r--r--Source/cmArchiveWrite.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 44d0d4e..234af79 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -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);