Changeset 2243

Timestamp:

21/08/2008 11:12:55 (5 months ago)

Author:

chris

Message:

Change FileStream? constructor to take a const std::string& instead of a
char array pointer, for C++ style.

Location:

box/trunk/lib/common

Files:

• FileStream.cpp (modified) (2 diffs)
• FileStream.h (modified) (1 diff)

box/trunk/lib/common/FileStream.cpp

@@ -25 +25 @@
 //
 // --------------------------------------------------------------------------
-FileStream::FileStream(const char *Filename, int flags, int mode)
-#ifdef WIN32
-        : mOSFileHandle(::openfile(Filename, flags, mode)),
-#else
-        : mOSFileHandle(::open(Filename, flags, mode)),
+FileStream::FileStream(const std::string& rFilename, int flags, int mode)
+#ifdef WIN32
+        : mOSFileHandle(::openfile(rFilename.c_str(), flags, mode)),
+#else
+        : mOSFileHandle(::open(rFilename.c_str(), flags, mode)),
 #endif
           mIsEOF(false),
-          mFileName(Filename)
+          mFileName(rFilename)
 {
 #ifdef WIN32
@@ -49 +49 @@
                 {
                         BOX_LOG_SYS_WARNING("Failed to open file: " <<
-                                Filename);
+                                rFilename);
                         THROW_EXCEPTION(CommonException, OSFileOpenError)
                 }

box/trunk/lib/common/FileStream.h

@@ -32 +32 @@
 {
 public:
-        FileStream(const char *Filename, 
+        FileStream(const std::string& rFilename, 
 #ifdef WIN32
                 int flags = (O_RDONLY | O_BINARY),