From cc7dd13e4e0962700ba00c7e31046eaf82bdf6d6 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 5 Mar 2018 00:37:05 -0800
Subject: [PATCH] ircd::http: Fix enum decl related and struct packing of
 error.

---
 include/ircd/http.h | 10 +++++-----
 ircd/http.cc        |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/ircd/http.h b/include/ircd/http.h
index ab5d98ea1..3257b9683 100644
--- a/include/ircd/http.h
+++ b/include/ircd/http.h
@@ -24,8 +24,8 @@ namespace ircd::http
 	struct request;
 	struct response;
 
-	string_view status(const enum code &);
-	enum code status(const string_view &);
+	string_view status(const code &);
+	code status(const string_view &);
 
 	void writeline(window_buffer &);
 	void writeline(window_buffer &, const window_buffer::closure &);
@@ -87,12 +87,12 @@ enum ircd::http::code
 struct ircd::http::error
 :ircd::error
 {
-	enum code code;
 	std::string content;
 	std::string headers;
+	http::code code;
 
-	error(const enum code &, std::string content = {}, std::string headers = {});
-	error(const enum code &, std::string content, const vector_view<const header> &);
+	error(const http::code &, std::string content = {}, std::string headers = {});
+	error(const http::code &, std::string content, const vector_view<const header> &);
 };
 
 /// Represents a single \r\n delimited line used in HTTP.
diff --git a/ircd/http.cc b/ircd/http.cc
index e84504b9d..cff7dd2c2 100644
--- a/ircd/http.cc
+++ b/ircd/http.cc
@@ -853,23 +853,23 @@ ircd::http::throw_error(const qi::expectation_failure<const char *> &e)
 	};
 }
 
-ircd::http::error::error(const enum code &code,
+ircd::http::error::error(const http::code &code,
                          std::string content,
                          const vector_view<const header> &headers)
-:error
+:http::error
 {
 	code, std::move(content), strung(headers)
 }
 {
 }
 
-ircd::http::error::error(const enum code &code,
+ircd::http::error::error(const http::code &code,
                          std::string content,
                          std::string headers)
 :ircd::error{generate_skip}
-,code{code}
 ,content{std::move(content)}
 ,headers{std::move(headers)}
+,code{code}
 {
 	snprintf(buf, sizeof(buf), "%d %s", int(code), status(code).c_str());
 }