Browse Source

Disallow copies of memory stream

Michael Ragazzon 6 years ago
parent
commit
a8950bd961
2 changed files with 0 additions and 32 deletions
  1. 0 4
      Include/Rocket/Core/StreamMemory.h
  2. 0 28
      Source/Core/StreamMemory.cpp

+ 0 - 4
Include/Rocket/Core/StreamMemory.h

@@ -48,12 +48,8 @@ public:
 	StreamMemory(size_t initial_size);
 	/// Read only memory stream based on the existing buffer
 	StreamMemory(const byte* buffer, size_t buffer_size);
-	/// Copy a memory stream
-	StreamMemory(const StreamMemory& copy); 
 	virtual ~StreamMemory();
 
-	StreamMemory& operator=(const StreamMemory& copy);
-
 	/// Close the stream
 	virtual void Close();	
 

+ 0 - 28
Source/Core/StreamMemory.cpp

@@ -64,40 +64,12 @@ StreamMemory::StreamMemory(const byte* _buffer, size_t _buffer_size)
 	buffer_ptr = buffer;	
 }
 
-StreamMemory::StreamMemory(const StreamMemory& copy) : Stream(copy)
-{
-	buffer = NULL;
-	buffer_ptr = NULL;
-	buffer_size = 0;
-	buffer_used = 0;
-	owns_buffer = true;
-	
-	// Copy the buffer and pointer offsets
-	Reallocate( ( ( copy.buffer_used + BUFFER_INCREMENTS ) / BUFFER_INCREMENTS ) * BUFFER_INCREMENTS );
-	ROCKET_ASSERTMSG(buffer != NULL, "Could not allocate buffer for StreamMemory reader.");
-	if(buffer != NULL)
-	{
-		memcpy( buffer, copy.buffer, copy.buffer_used );
-		buffer_ptr = buffer + ( copy.buffer_ptr - copy.buffer );
-	}
-}
-
 StreamMemory::~StreamMemory() 
 {
 	if ( owns_buffer )
 		free( buffer );
 }
 
-StreamMemory& StreamMemory::operator=( const StreamMemory& copy )
-{
-	// Copy the buffer and pointer offsets
-	Reallocate( ( ( copy.buffer_used + BUFFER_INCREMENTS ) / BUFFER_INCREMENTS ) * BUFFER_INCREMENTS );
-	memcpy( buffer, copy.buffer, copy.buffer_used );
-	buffer_ptr = buffer + ( copy.buffer_ptr - copy.buffer );
-	
-	return *this;
-}
-
 void StreamMemory::Close() 
 {
 	Stream::Close();