From 2f07ec9114839fb6837c79009e74c15e80eab990 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 21 Aug 2008 10:12:55 +0000 Subject: Change FileStream constructor to take a const std::string& instead of a char array pointer, for C++ style. --- lib/common/FileStream.cpp | 10 +++++----- lib/common/FileStream.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/common/FileStream.cpp b/lib/common/FileStream.cpp index 7737656d..2e76460a 100644 --- a/lib/common/FileStream.cpp +++ b/lib/common/FileStream.cpp @@ -24,14 +24,14 @@ // Created: 2003/07/31 // // -------------------------------------------------------------------------- -FileStream::FileStream(const char *Filename, int flags, int mode) +FileStream::FileStream(const std::string& rFilename, int flags, int mode) #ifdef WIN32 - : mOSFileHandle(::openfile(Filename, flags, mode)), + : mOSFileHandle(::openfile(rFilename.c_str(), flags, mode)), #else - : mOSFileHandle(::open(Filename, flags, mode)), + : mOSFileHandle(::open(rFilename.c_str(), flags, mode)), #endif mIsEOF(false), - mFileName(Filename) + mFileName(rFilename) { #ifdef WIN32 if(mOSFileHandle == INVALID_HANDLE_VALUE) @@ -48,7 +48,7 @@ FileStream::FileStream(const char *Filename, int flags, int mode) else { BOX_LOG_SYS_WARNING("Failed to open file: " << - Filename); + rFilename); THROW_EXCEPTION(CommonException, OSFileOpenError) } } diff --git a/lib/common/FileStream.h b/lib/common/FileStream.h index 23cc8e75..5efb91ea 100644 --- a/lib/common/FileStream.h +++ b/lib/common/FileStream.h @@ -31,7 +31,7 @@ class FileStream : public IOStream { public: - FileStream(const char *Filename, + FileStream(const std::string& rFilename, #ifdef WIN32 int flags = (O_RDONLY | O_BINARY), #else -- cgit v1.2.3