From b74f0e59ee1e9ee66e8a09ccb18cc588b329a292 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sat, 4 Mar 2017 14:07:19 -0500
Subject: [PATCH] mapped file fixes.

---
 mapped_file.cpp | 8 +++++++-
 mapped_file.h   | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mapped_file.cpp b/mapped_file.cpp
index 90c87da..1138298 100644
--- a/mapped_file.cpp
+++ b/mapped_file.cpp
@@ -27,8 +27,14 @@ namespace {
 		throw_error(GetLastError());
 	}
 
+	void throw_error(const char *what) {
+		int e = GetLastError();
+		throw_error(e, what);
+	}
+
 	void throw_error(const std::string &what) {
-		throw_error(GetLastError(), what);
+		int e = GetLastError();
+		throw_error(e, what);
 	}
 
 }
diff --git a/mapped_file.h b/mapped_file.h
index 9d4452f..563c89c 100644
--- a/mapped_file.h
+++ b/mapped_file.h
@@ -96,7 +96,7 @@ public:
 	}
 
 	value_type *data() {
-		return _flags == readonly ? (value_type *)nullptr : (value_type *)_data;
+		return (value_type *)_data;
 	}
 
 	const_iterator cbegin() const {
@@ -119,11 +119,11 @@ public:
 
 
 	iterator begin() {
-		return _flags == readonly ? (iterator)nullptr : (iterator)_data;
+		return (iterator)_data;
 	}
 
 	iterator end() {
-		return _flags == readonly ? (iterator)nullptr : (iterator)_data + size();
+		return (iterator)_data + size();
 	}
 
 	mapmode flags() const {