Consolidate parsers to parser.hpp

fix #405
2017-06-03 11:29:48 -07:00
parent 290bdf146e
commit 3cb385dc2d
14 changed files with 258 additions and 327 deletions
@@ -1,26 +0,0 @@
-//
-// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BEAST_HTTP_IMPL_HEADER_PARSER_IPP
-#define BEAST_HTTP_IMPL_HEADER_PARSER_IPP
-
-namespace beast {
-namespace http {
-
-template<bool isRequest, class Fields>
-template<class Arg0, class... ArgN, class>
-header_parser<isRequest, Fields>::
-header_parser(Arg0&& arg0, ArgN&&... argn)
-    : h_(std::forward<Arg0>(arg0),
-         std::forward<ArgN>(argn)...)
-{
-}
-
-} // http
-} // beast
-
-#endif
@@ -5,12 +5,21 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //

-#ifndef BEAST_HTTP_IMPL_MESSAGE_PARSER_IPP
-#define BEAST_HTTP_IMPL_MESSAGE_PARSER_IPP
+#ifndef BEAST_HTTP_IMPL_PARSER_IPP
+#define BEAST_HTTP_IMPL_PARSER_IPP

 namespace beast {
 namespace http {

+template<bool isRequest, class Fields>
+template<class Arg0, class... ArgN, class>
+header_parser<isRequest, Fields>::
+header_parser(Arg0&& arg0, ArgN&&... argn)
+    : h_(std::forward<Arg0>(arg0),
+         std::forward<ArgN>(argn)...)
+{
+}
+
 template<bool isRequest, class Body, class Fields>
 template<class Arg1, class... ArgN, class>
 message_parser<isRequest, Body, Fields>::
@@ -10,7 +10,7 @@

 #include <beast/http/type_traits.hpp>
 #include <beast/http/error.hpp>
-#include <beast/http/message_parser.hpp>
+#include <beast/http/parser.hpp>
 #include <beast/http/read.hpp>
 #include <beast/core/bind_handler.hpp>
 #include <beast/core/handler_ptr.hpp>