From 22231518b9c2c0b7f73c72a6ca834df659c63c7f Mon Sep 17 00:00:00 2001
From: Dennis Brentjes <d.brentjes@gmail.com>
Date: Wed, 22 Jun 2016 00:15:08 +0200
Subject: Reduces the amount of boilerplate neccesary to parse the binary
 format.

---
 mz/mz_header.hpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'mz/mz_header.hpp')

diff --git a/mz/mz_header.hpp b/mz/mz_header.hpp
index 9bef928..c783335 100644
--- a/mz/mz_header.hpp
+++ b/mz/mz_header.hpp
@@ -10,8 +10,6 @@
 
 namespace mz {
 
-using namespace binparse;
-
 struct NotAMZFileException : public std::runtime_error {
 	NotAMZFileException();
 };
@@ -22,7 +20,11 @@ struct UnexpectedEOS : public std::runtime_error {
 	UnexpectedEOS(std::string location);
 };
 
-struct MZHeader {
+using binparse::Magic16;
+using binparse::Value16;
+using binparse::Offset16;
+
+struct Header {
 	Magic16 magic;
 	Value16 bytes_in_last_block;
 	Value16 blocks_in_file;
@@ -39,8 +41,8 @@ struct MZHeader {
 	Value16 overlay_number;
 };
 
-MZHeader parse_header(std::istream& is);
+Header parse_header(std::istream& is);
 
-std::ostream& operator<<(std::ostream& os, MZHeader const& header);
+std::ostream& operator<<(std::ostream& os, Header const& header);
 
 }
-- 
cgit v1.2.3-70-g09d2