1 files changed, 30 insertions, 30 deletions

diff --git a/src/core/buffer.cpp b/src/core/buffer.cpp
index ad471d7..81fc0df 100644
--- a/src/core/buffer.cpp
+++ b/src/core/buffer.cpp
@@ -81,36 +81,36 @@ std::string buffer::to_hex() const {
 }
 
 buffer_view::buffer_view(buffer &buffer)
-	: buffer_{buffer}, read_offset_{0}, write_offset_{0} {}
+	: buffer_{&buffer}, read_offset_{0}, write_offset_{0} {}
 
 size_t buffer_view::read_position() const {
-	return read_offset_ + buffer_.read_position();
+	return read_offset_ + buffer_->read_position();
 }
 
 size_t buffer_view::read_composite_length() const {
-	assert(read_offset_ <= buffer_.read_composite_length());
-	if (read_offset_ > buffer_.read_composite_length()) {
+	assert(read_offset_ <= buffer_->read_composite_length());
+	if (read_offset_ > buffer_->read_composite_length()) {
 		return 0;
 	}
 
-	return buffer_.read_composite_length() - read_offset_;
+	return buffer_->read_composite_length() - read_offset_;
 }
 
 size_t buffer_view::read_segment_length(size_t offset) const {
 	size_t off = offset + read_offset_;
-	assert(off <= buffer_.read_composite_length());
-	if (off > buffer_.read_composite_length()) {
+	assert(off <= buffer_->read_composite_length());
+	if (off > buffer_->read_composite_length()) {
 		return 0;
 	}
 
-	return buffer_.read_segment_length(off);
+	return buffer_->read_segment_length(off);
 }
 
 void buffer_view::read_advance(size_t bytes) {
 	size_t offset = bytes + read_offset_;
-	assert(offset <= buffer_.read_composite_length());
-	if (offset > buffer_.read_composite_length()) {
-		read_offset_ += buffer_.read_composite_length();
+	assert(offset <= buffer_->read_composite_length());
+	if (offset > buffer_->read_composite_length()) {
+		read_offset_ += buffer_->read_composite_length();
 		return;
 	}
 
@@ -120,47 +120,47 @@ void buffer_view::read_advance(size_t bytes) {
 uint8_t &buffer_view::read(size_t i) {
 	size_t pos = i + read_offset_;
 
-	assert(pos < buffer_.read_composite_length());
+	assert(pos < buffer_->read_composite_length());
 
-	return buffer_.read(pos);
+	return buffer_->read(pos);
 }
 
 const uint8_t &buffer_view::read(size_t i) const {
 	size_t pos = i + read_offset_;
 
-	assert(pos < buffer_.read_composite_length());
+	assert(pos < buffer_->read_composite_length());
 
-	return buffer_.read(pos);
+	return buffer_->read(pos);
 }
 
 size_t buffer_view::write_position() const {
-	return write_offset_ + buffer_.write_position();
+	return write_offset_ + buffer_->write_position();
 }
 
 size_t buffer_view::write_composite_length() const {
-	assert(write_offset_ <= buffer_.write_composite_length());
-	if (write_offset_ > buffer_.write_composite_length()) {
+	assert(write_offset_ <= buffer_->write_composite_length());
+	if (write_offset_ > buffer_->write_composite_length()) {
 		return 0;
 	}
 
-	return buffer_.write_composite_length() - write_offset_;
+	return buffer_->write_composite_length() - write_offset_;
 }
 
 size_t buffer_view::write_segment_length(size_t offset) const {
 	size_t off = offset + write_offset_;
-	assert(off <= buffer_.write_composite_length());
-	if (off > buffer_.write_composite_length()) {
+	assert(off <= buffer_->write_composite_length());
+	if (off > buffer_->write_composite_length()) {
 		return 0;
 	}
 
-	return buffer_.write_segment_length(off);
+	return buffer_->write_segment_length(off);
 }
 
 void buffer_view::write_advance(size_t bytes) {
 	size_t offset = bytes + write_offset_;
-	assert(offset <= buffer_.write_composite_length());
-	if (offset > buffer_.write_composite_length()) {
-		write_offset_ += buffer_.write_composite_length();
+	assert(offset <= buffer_->write_composite_length());
+	if (offset > buffer_->write_composite_length()) {
+		write_offset_ += buffer_->write_composite_length();
 		return;
 	}
 
@@ -170,21 +170,21 @@ void buffer_view::write_advance(size_t bytes) {
 uint8_t &buffer_view::write(size_t i) {
 	size_t pos = i + write_offset_;
 
-	assert(pos < buffer_.write_composite_length());
+	assert(pos < buffer_->write_composite_length());
 
-	return buffer_.write(pos);
+	return buffer_->write(pos);
 }
 
 const uint8_t &buffer_view::write(size_t i) const {
 	size_t pos = i + write_offset_;
 
-	assert(pos < buffer_.write_composite_length());
+	assert(pos < buffer_->write_composite_length());
 
-	return buffer_.write(pos);
+	return buffer_->write(pos);
 }
 
 error buffer_view::write_require_length(size_t bytes) {
-	return buffer_.write_require_length(bytes + write_offset_);
+	return buffer_->write_require_length(bytes + write_offset_);
 }
 
 size_t buffer_view::read_offset() const { return read_offset_; }