mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Initialise fields of MemoryStream in header

Browse Source 
This makes all the constructors use these defaulted values
This commit is contained in:
Michał Janiszewski
2017-01-12 09:58:57 +01:00
committed by GitHub
parent afbe1dda0f
commit 171d973e55
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/core/MemoryStream.cpp
View File

@@ -18,17 +18,6 @@
#include "Memory.hpp"
#include "MemoryStream.h"
MemoryStream::MemoryStream()
{
_access = MEMORY_ACCESS_READ |
MEMORY_ACCESS_WRITE |
MEMORY_ACCESS_OWNER;
_dataCapacity = 0;
_dataSize = 0;
_data = nullptr;
_position = nullptr;
}
MemoryStream::MemoryStream(const MemoryStream &copy)
{
_access = copy._access;
@@ -44,11 +33,7 @@ MemoryStream::MemoryStream(const MemoryStream &copy)
MemoryStream::MemoryStream(size_t capacity)
{
_access = MEMORY_ACCESS_READ |
MEMORY_ACCESS_WRITE |
MEMORY_ACCESS_OWNER;
_dataCapacity = capacity;
_dataSize = 0;
_data = Memory::Allocate<void>(capacity);
_position = _data;
}

12
src/openrct2/core/MemoryStream.h
View File

@@ -32,15 +32,15 @@ enum MEMORY_ACCESS
class MemoryStream final : public IStream
{
private:
uint16 _access;
size_t _dataCapacity;
size_t _dataSize;
void * _data;
void * _position;
uint16 _access = MEMORY_ACCESS_READ | MEMORY_ACCESS_WRITE | MEMORY_ACCESS_OWNER;
size_t _dataCapacity = 0;
size_t _dataSize = 0;
void * _data = nullptr;
void * _position = nullptr;
public:
MemoryStream();
MemoryStream(const MemoryStream &copy);
MemoryStream(const MemoryStream & copy);
explicit MemoryStream(size_t capacity);
MemoryStream(void * data, size_t dataSize, uint32 access = MEMORY_ACCESS_READ);
MemoryStream(const void * data, size_t dataSize);