Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -24,20 +24,20 @@ FileInputStream::FileInputStream(const File &file)
|
||||
file.getPath().c_str(), // file name
|
||||
GENERIC_READ, // access mode
|
||||
0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
|
||||
NULL, // Unused
|
||||
nullptr, // Unused
|
||||
OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
|
||||
FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
|
||||
NULL // Unsupported
|
||||
nullptr // Unsupported
|
||||
);
|
||||
#else
|
||||
m_fileHandle = CreateFile(
|
||||
pchFilename, // file name
|
||||
GENERIC_READ, // access mode
|
||||
0, // share mode // TODO 4J Stu - Will we need to share file? Probably not but...
|
||||
NULL, // Unused
|
||||
nullptr, // Unused
|
||||
OPEN_EXISTING , // how to create // TODO 4J Stu - Assuming that the file already exists if we are opening to read from it
|
||||
FILE_FLAG_SEQUENTIAL_SCAN, // file attributes
|
||||
NULL // Unsupported
|
||||
nullptr // Unsupported
|
||||
);
|
||||
#endif
|
||||
|
||||
@@ -68,7 +68,7 @@ int FileInputStream::read()
|
||||
&byteRead, // data buffer
|
||||
1, // number of bytes to read
|
||||
&numberOfBytesRead, // number of bytes read
|
||||
NULL // overlapped buffer
|
||||
nullptr // overlapped buffer
|
||||
);
|
||||
|
||||
if( bSuccess==FALSE )
|
||||
@@ -100,7 +100,7 @@ int FileInputStream::read(byteArray b)
|
||||
b.data, // data buffer
|
||||
b.length, // number of bytes to read
|
||||
&numberOfBytesRead, // number of bytes read
|
||||
NULL // overlapped buffer
|
||||
nullptr // overlapped buffer
|
||||
);
|
||||
|
||||
if( bSuccess==FALSE )
|
||||
@@ -138,7 +138,7 @@ int FileInputStream::read(byteArray b, unsigned int offset, unsigned int length)
|
||||
&b[offset], // data buffer
|
||||
length, // number of bytes to read
|
||||
&numberOfBytesRead, // number of bytes read
|
||||
NULL // overlapped buffer
|
||||
nullptr // overlapped buffer
|
||||
);
|
||||
|
||||
if( bSuccess==FALSE )
|
||||
|
||||
Reference in New Issue
Block a user