Tidy up core sources:

The core headers are moved to their own directory (but remain in
the same namespace).

include/beast/core.hpp

@@ -0,0 +1,31 @@
+//
+// Copyright (c) 2013-2016 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_CORE_HPP
+#define BEAST_CORE_HPP
+
+#include <beast/core/async_completion.hpp>
+#include <beast/core/basic_streambuf.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/buffer_cat.hpp>
+#include <beast/core/buffer_concepts.hpp>
+#include <beast/core/buffers_adapter.hpp>
+#include <beast/core/consuming_buffers.hpp>
+#include <beast/core/error.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/handler_concepts.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/prepare_buffers.hpp>
+#include <beast/core/static_streambuf.hpp>
+#include <beast/core/static_string.hpp>
+#include <beast/core/stream_concepts.hpp>
+#include <beast/core/streambuf.hpp>
+#include <beast/core/streambuf_readstream.hpp>
+#include <beast/core/to_string.hpp>
+#include <beast/core/write_streambuf.hpp>
+
+#endif

include/beast/core/async_completion.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_ASYNC_COMPLETION_HPP
 #define BEAST_ASYNC_COMPLETION_HPP
 
-#include <beast/handler_concepts.hpp>
+#include <beast/core/handler_concepts.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/handler_type.hpp>
 #include <type_traits>

include/beast/core/basic_streambuf.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_BASIC_STREAMBUF_HPP
 #define BEAST_BASIC_STREAMBUF_HPP
 
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/intrusive/list.hpp>
 #include <iterator>
@@ -298,6 +298,6 @@ operator<<(basic_streambuf<Allocator>& streambuf, T const& t);
 
 } // beast
 
-#include <beast/impl/basic_streambuf.ipp>
+#include <beast/core/impl/basic_streambuf.ipp>
 
 #endif

include/beast/core/bind_handler.hpp

@@ -8,8 +8,8 @@
 #ifndef BEAST_BIND_HANDLER_HPP
 #define BEAST_BIND_HANDLER_HPP
 
-#include <beast/handler_concepts.hpp>
-#include <beast/detail/bind_handler.hpp>
+#include <beast/core/handler_concepts.hpp>
+#include <beast/core/detail/bind_handler.hpp>
 #include <type_traits>
 #include <utility>
 

include/beast/core/buffer_cat.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_BUFFER_CAT_HPP
 #define BEAST_BUFFER_CAT_HPP
 
-#include <beast/detail/buffer_cat.hpp>
+#include <beast/core/detail/buffer_cat.hpp>
 #include <boost/asio/buffer.hpp>
 #include <cstdint>
 #include <iterator>

include/beast/core/buffer_concepts.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_BUFFER_CONCEPTS_HPP
 #define BEAST_BUFFER_CONCEPTS_HPP
 
-#include <beast/detail/buffer_concepts.hpp>
+#include <beast/core/detail/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <type_traits>
 

include/beast/core/buffers_adapter.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_BUFFERS_ADAPTER_HPP
 #define BEAST_BUFFERS_ADAPTER_HPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <type_traits>
 
@@ -145,6 +145,6 @@ public:
 
 } // beast
 
-#include <beast/impl/buffers_adapter.ipp>
+#include <beast/core/impl/buffers_adapter.ipp>
 
 #endif

include/beast/core/consuming_buffers.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_CONSUMING_BUFFERS_HPP
 #define BEAST_CONSUMING_BUFFERS_HPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <cstdint>
 #include <iterator>
@@ -135,6 +135,6 @@ consumed_buffers(BufferSequence const& buffers, std::size_t n);
 
 } // beast
 
-#include <beast/impl/consuming_buffers.ipp>
+#include <beast/core/impl/consuming_buffers.ipp>
 
 #endif

include/beast/core/detail/bind_handler.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_BIND_DETAIL_HANDLER_HPP
 #define BEAST_BIND_DETAIL_HANDLER_HPP
 
-#include <beast/detail/integer_sequence.hpp>
+#include <beast/core/detail/integer_sequence.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>

include/beast/core/detail/stream_concepts.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_DETAIL_STREAM_CONCEPTS_HPP
 #define BEAST_DETAIL_STREAM_CONCEPTS_HPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/system/error_code.hpp>
 #include <type_traits>

include/beast/core/detail/write_streambuf.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_DETAIL_WRITE_STREAMBUF_HPP
 #define BEAST_DETAIL_WRITE_STREAMBUF_HPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/lexical_cast.hpp>
 #include <utility>

include/beast/core/handler_concepts.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_HANDLER_CONCEPTS_HPP
 #define BEAST_HANDLER_CONCEPTS_HPP
 
-#include <beast/detail/is_call_possible.hpp>
+#include <beast/core/detail/is_call_possible.hpp>
 #include <type_traits>
 
 namespace beast {

include/beast/core/impl/basic_streambuf.ipp

@@ -8,7 +8,7 @@
 #ifndef BEAST_IMPL_BASIC_STREAMBUF_IPP
 #define BEAST_IMPL_BASIC_STREAMBUF_IPP
 
-#include <beast/detail/write_streambuf.hpp>
+#include <beast/core/detail/write_streambuf.hpp>
 #include <algorithm>
 #include <cassert>
 #include <exception>

include/beast/core/impl/consuming_buffers.ipp

@@ -8,7 +8,7 @@
 #ifndef BEAST_IMPL_CONSUMING_BUFFERS_IPP
 #define BEAST_IMPL_CONSUMING_BUFFERS_IPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <algorithm>
 #include <cstdint>

include/beast/core/impl/streambuf_readstream.ipp

@@ -8,9 +8,9 @@
 #ifndef BEAST_IMPL_STREAMBUF_READSTREAM_IPP
 #define BEAST_IMPL_STREAMBUF_READSTREAM_IPP
 
-#include <beast/bind_handler.hpp>
-#include <beast/handler_concepts.hpp>
-#include <beast/handler_alloc.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/handler_concepts.hpp>
+#include <beast/core/handler_alloc.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_error.hpp>
 
@@ -199,7 +199,7 @@ read_some(
     error_code ec;
     auto n = read_some(buffers, ec);
     if(ec)
-        throw boost::system::system_error{ec};
+        throw system_error{ec};
     return n;
 }
 

include/beast/core/prepare_buffers.hpp

@@ -152,6 +152,6 @@ prepare_buffers(std::size_t n, BufferSequence const& buffers);
 
 } // beast
 
-#include <beast/impl/prepare_buffers.ipp>
+#include <beast/core/impl/prepare_buffers.ipp>
 
 #endif

include/beast/core/static_streambuf.hpp

@@ -184,6 +184,6 @@ public:
 
 } // beast
 
-#include <beast/impl/static_streambuf.ipp>
+#include <beast/core/impl/static_streambuf.ipp>
 
 #endif

include/beast/core/stream_concepts.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_STREAM_CONCEPTS_HPP
 #define BEAST_STREAM_CONCEPTS_HPP
 
-#include <beast/detail/stream_concepts.hpp>
+#include <beast/core/detail/stream_concepts.hpp>
 #include <type_traits>
 
 namespace beast {

include/beast/core/streambuf.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_STREAMBUF_HPP
 #define BEAST_STREAMBUF_HPP
 
-#include <beast/basic_streambuf.hpp>
+#include <beast/core/basic_streambuf.hpp>
 
 namespace beast {
 

include/beast/core/streambuf_readstream.hpp

@@ -8,11 +8,12 @@
 #ifndef BEAST_STREAMBUF_READSTREAM_HPP
 #define BEAST_STREAMBUF_READSTREAM_HPP
 
-#include <beast/async_completion.hpp>
-#include <beast/buffer_concepts.hpp>
-#include <beast/stream_concepts.hpp>
-#include <beast/streambuf.hpp>
-#include <beast/detail/get_lowest_layer.hpp>
+#include <beast/core/async_completion.hpp>
+#include <beast/core/buffer_concepts.hpp>
+#include <beast/core/error.hpp>
+#include <beast/core/stream_concepts.hpp>
+#include <beast/core/streambuf.hpp>
+#include <beast/core/detail/get_lowest_layer.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/system/error_code.hpp>
@@ -276,6 +277,6 @@ public:
 
 } // beast
 
-#include <beast/impl/streambuf_readstream.ipp>
+#include <beast/core/impl/streambuf_readstream.ipp>
 
 #endif

include/beast/core/to_string.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_TO_STRING_HPP
 #define BEAST_TO_STRING_HPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 #include <boost/asio/buffer.hpp>
 #include <string>
 

include/beast/core/write_streambuf.hpp

@@ -8,8 +8,8 @@
 #ifndef BEAST_WRITE_STREAMBUF_HPP
 #define BEAST_WRITE_STREAMBUF_HPP
 
-#include <beast/buffer_concepts.hpp>
-#include <beast/detail/write_streambuf.hpp>
+#include <beast/core/buffer_concepts.hpp>
+#include <beast/core/detail/write_streambuf.hpp>
 #include <type_traits>
 #include <utility>
 

include/beast/http/basic_headers.hpp

@@ -8,8 +8,8 @@
 #ifndef BEAST_HTTP_BASIC_HEADERS_HPP
 #define BEAST_HTTP_BASIC_HEADERS_HPP
 
-#include <beast/detail/ci_char_traits.hpp>
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/lexical_cast.hpp>

include/beast/http/body_type.hpp

@@ -11,7 +11,7 @@
 // Convenience header to include everything
 // needed when declarating a user defined Body type.
 
-#include <beast/error.hpp>
+#include <beast/core/error.hpp>
 #include <beast/http/message.hpp>
 #include <beast/http/resume_context.hpp>
 #include <boost/logic/tribool.hpp>

include/beast/http/empty_body.hpp

@@ -9,7 +9,7 @@
 #define BEAST_HTTP_EMPTY_BODY_HPP
 
 #include <beast/http/body_type.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <boost/asio/buffer.hpp>
 #include <memory>
 #include <string>

include/beast/http/impl/basic_parser_v1.ipp

@@ -8,7 +8,7 @@
 #ifndef BEAST_HTTP_IMPL_BASIC_PARSER_V1_IPP
 #define BEAST_HTTP_IMPL_BASIC_PARSER_V1_IPP
 
-#include <beast/buffer_concepts.hpp>
+#include <beast/core/buffer_concepts.hpp>
 
 namespace beast {
 namespace http {

include/beast/http/impl/read.ipp

@@ -9,9 +9,9 @@
 #define BEAST_HTTP_IMPL_READ_IPP_HPP
 
 #include <beast/http/parser_v1.hpp>
-#include <beast/bind_handler.hpp>
-#include <beast/handler_alloc.hpp>
-#include <beast/stream_concepts.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/stream_concepts.hpp>
 #include <cassert>
 
 namespace beast {
@@ -221,7 +221,7 @@ read(SyncReadStream& stream, Streambuf& streambuf,
     error_code ec;
     read(stream, streambuf, msg, ec);
     if(ec)
-        throw boost::system::system_error{ec};
+        throw system_error{ec};
 }
 
 template<class SyncReadStream, class Streambuf,

include/beast/http/impl/write.ipp

@@ -11,13 +11,13 @@
 #include <beast/http/resume_context.hpp>
 #include <beast/http/detail/chunk_encode.hpp>
 #include <beast/http/detail/has_content_length.hpp>
-#include <beast/buffer_cat.hpp>
-#include <beast/bind_handler.hpp>
-#include <beast/buffer_concepts.hpp>
-#include <beast/handler_alloc.hpp>
-#include <beast/stream_concepts.hpp>
-#include <beast/streambuf.hpp>
-#include <beast/write_streambuf.hpp>
+#include <beast/core/buffer_cat.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/buffer_concepts.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/stream_concepts.hpp>
+#include <beast/core/streambuf.hpp>
+#include <beast/core/write_streambuf.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/logic/tribool.hpp>
 #include <condition_variable>
@@ -451,7 +451,7 @@ write(SyncWriteStream& stream,
     error_code ec;
     write(stream, msg, ec);
     if(ec)
-        throw boost::system::system_error{ec};
+        throw system_error{ec};
 }
 
 template<class SyncWriteStream,
@@ -575,7 +575,7 @@ public:
         error_code ec;
         auto const n = write_some(buffers, ec);
         if(ec)
-            throw boost::system::system_error{ec};
+            throw system_error{ec};
         return n;
     }
 
@@ -614,7 +614,7 @@ operator<<(std::ostream& os,
     error_code ec;
     write(oss, msg, ec);
     if(ec && ec != boost::asio::error::eof)
-        throw boost::system::system_error{ec};
+        throw system_error{ec};
     return os;
 }
 

include/beast/http/parse_error.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_HTTP_PARSE_ERROR_HPP
 #define BEAST_HTTP_PARSE_ERROR_HPP
 
-#include <beast/error.hpp>
+#include <beast/core/error.hpp>
 
 namespace beast {
 namespace http {

include/beast/http/parser_v1.hpp

@@ -8,9 +8,9 @@
 #ifndef BEAST_HTTP_PARSER_V1_HPP
 #define BEAST_HTTP_PARSER_V1_HPP
 
-#include <beast/error.hpp>
 #include <beast/http/basic_parser_v1.hpp>
 #include <beast/http/message_v1.hpp>
+#include <beast/core/error.hpp>
 #include <boost/optional.hpp>
 #include <functional>
 #include <string>

include/beast/http/read.hpp

@@ -8,9 +8,9 @@
 #ifndef BEAST_HTTP_READ_HPP
 #define BEAST_HTTP_READ_HPP
 
-#include <beast/error.hpp>
 #include <beast/http/parser_v1.hpp>
-#include <beast/async_completion.hpp>
+#include <beast/core/error.hpp>
+#include <beast/core/async_completion.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/system/error_code.hpp>
 

include/beast/http/streambuf_body.hpp

@@ -9,8 +9,8 @@
 #define BEAST_HTTP_STREAMBUF_BODY_HPP
 
 #include <beast/http/body_type.hpp>
-#include <beast/buffer_cat.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/buffer_cat.hpp>
+#include <beast/core/streambuf.hpp>
 #include <memory>
 #include <string>
 

include/beast/http/string_body.hpp

@@ -9,8 +9,8 @@
 #define BEAST_HTTP_STRING_BODY_HPP
 
 #include <beast/http/body_type.hpp>
-#include <beast/buffer_cat.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/buffer_cat.hpp>
+#include <beast/core/streambuf.hpp>
 #include <memory>
 #include <string>
 

include/beast/http/type_check.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_HTTP_TYPE_CHECK_HPP
 #define BEAST_HTTP_TYPE_CHECK_HPP
 
-#include <beast/error.hpp>
+#include <beast/core/error.hpp>
 #include <boost/asio/buffer.hpp>
 #include <type_traits>
 #include <utility>

include/beast/http/write.hpp

@@ -8,10 +8,9 @@
 #ifndef BEAST_HTTP_WRITE_HPP
 #define BEAST_HTTP_WRITE_HPP
 
-#include <beast/error.hpp>
 #include <beast/http/message_v1.hpp>
-#include <beast/async_completion.hpp>
-#include <boost/system/error_code.hpp>
+#include <beast/core/error.hpp>
+#include <beast/core/async_completion.hpp>
 #include <ostream>
 #include <type_traits>
 

include/beast/websocket/detail/frame.hpp

@@ -11,9 +11,9 @@
 #include <beast/websocket/rfc6455.hpp>
 #include <beast/websocket/detail/endian.hpp>
 #include <beast/websocket/detail/utf8_checker.hpp>
-#include <beast/consuming_buffers.hpp>
-#include <beast/static_streambuf.hpp>
-#include <beast/static_string.hpp>
+#include <beast/core/consuming_buffers.hpp>
+#include <beast/core/static_streambuf.hpp>
+#include <beast/core/static_string.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/endian/buffers.hpp>
 #include <cassert>

include/beast/websocket/detail/hybi13.hpp

@@ -8,8 +8,8 @@
 #ifndef BEAST_WEBSOCKET_DETAIL_HYBI13_HPP
 #define BEAST_WEBSOCKET_DETAIL_HYBI13_HPP
 
-#include <beast/detail/base64.hpp>
-#include <beast/detail/sha1.hpp>
+#include <beast/core/detail/base64.hpp>
+#include <beast/core/detail/sha1.hpp>
 #include <boost/utility/string_ref.hpp>
 #include <cstdint>
 #include <string>

include/beast/websocket/detail/stream_base.hpp

@@ -15,10 +15,10 @@
 #include <beast/websocket/detail/invokable.hpp>
 #include <beast/websocket/detail/mask.hpp>
 #include <beast/websocket/detail/utf8_checker.hpp>
-#include <beast/streambuf.hpp>
 #include <beast/http/empty_body.hpp>
 #include <beast/http/message.hpp>
 #include <beast/http/string_body.hpp>
+#include <beast/core/streambuf.hpp>
 #include <boost/asio/error.hpp>
 #include <cassert>
 #include <cstdint>
@@ -36,7 +36,7 @@ void
 maybe_throw(error_code const& ec, String const&)
 {
     if(ec)
-        throw boost::system::system_error{ec};
+        throw system_error{ec};
 }
 
 template<class UInt>

include/beast/websocket/error.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_WEBSOCKET_ERROR_HPP
 #define BEAST_WEBSOCKET_ERROR_HPP
 
-#include <beast/error.hpp>
+#include <beast/core/error.hpp>
 
 namespace beast {
 namespace websocket {

include/beast/websocket/impl/accept_op.ipp

@@ -12,8 +12,8 @@
 #include <beast/http/message_v1.hpp>
 #include <beast/http/parser_v1.hpp>
 #include <beast/http/read.hpp>
-#include <beast/handler_alloc.hpp>
-#include <beast/prepare_buffers.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/prepare_buffers.hpp>
 #include <cassert>
 #include <memory>
 #include <type_traits>

include/beast/websocket/impl/close_op.ipp

@@ -8,8 +8,8 @@
 #ifndef BEAST_WEBSOCKET_IMPL_CLOSE_OP_HPP
 #define BEAST_WEBSOCKET_IMPL_CLOSE_OP_HPP
 
-#include <beast/handler_alloc.hpp>
-#include <beast/static_streambuf.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/static_streambuf.hpp>
 #include <memory>
 
 namespace beast {

include/beast/websocket/impl/handshake_op.ipp

@@ -8,11 +8,11 @@
 #ifndef BEAST_WEBSOCKET_IMPL_HANDSHAKE_OP_HPP
 #define BEAST_WEBSOCKET_IMPL_HANDSHAKE_OP_HPP
 
-#include <beast/handler_alloc.hpp>
 #include <beast/http/empty_body.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/read.hpp>
 #include <beast/http/write.hpp>
+#include <beast/core/handler_alloc.hpp>
 #include <cassert>
 #include <memory>
 

include/beast/websocket/impl/read_frame_op.ipp

@@ -9,9 +9,9 @@
 #define BEAST_WEBSOCKET_IMPL_READ_FRAME_OP_HPP
 
 #include <beast/websocket/teardown.hpp>
-#include <beast/handler_alloc.hpp>
-#include <beast/prepare_buffers.hpp>
-#include <beast/static_streambuf.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/prepare_buffers.hpp>
+#include <beast/core/static_streambuf.hpp>
 #include <boost/optional.hpp>
 #include <cassert>
 #include <memory>

include/beast/websocket/impl/read_op.ipp

@@ -8,7 +8,7 @@
 #ifndef BEAST_WEBSOCKET_IMPL_READ_OP_HPP
 #define BEAST_WEBSOCKET_IMPL_READ_OP_HPP
 
-#include <beast/handler_alloc.hpp>
+#include <beast/core/handler_alloc.hpp>
 #include <memory>
 
 namespace beast {

include/beast/websocket/impl/response_op.ipp

@@ -8,10 +8,10 @@
 #ifndef BEAST_WEBSOCKET_IMPL_RESPONSE_OP_HPP
 #define BEAST_WEBSOCKET_IMPL_RESPONSE_OP_HPP
 
-#include <beast/handler_alloc.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/string_body.hpp>
 #include <beast/http/write.hpp>
+#include <beast/core/handler_alloc.hpp>
 #include <memory>
 
 namespace beast {

include/beast/websocket/impl/ssl.ipp

@@ -8,8 +8,8 @@
 #ifndef BEAST_WEBSOCKET_IMPL_SSL_IPP_INCLUDED
 #define BEAST_WEBSOCKET_IMPL_SSL_IPP_INCLUDED
 
-#include <beast/async_completion.hpp>
-#include <beast/handler_concepts.hpp>
+#include <beast/core/async_completion.hpp>
+#include <beast/core/handler_concepts.hpp>
 
 namespace beast {
 namespace websocket {

include/beast/websocket/impl/stream.ipp

@@ -22,13 +22,13 @@
 #include <beast/http/write.hpp>
 #include <beast/http/reason.hpp>
 #include <beast/http/rfc2616.hpp>
-#include <beast/buffer_cat.hpp>
-#include <beast/buffer_concepts.hpp>
-#include <beast/consuming_buffers.hpp>
-#include <beast/prepare_buffers.hpp>
-#include <beast/static_streambuf.hpp>
-#include <beast/stream_concepts.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/buffer_cat.hpp>
+#include <beast/core/buffer_concepts.hpp>
+#include <beast/core/consuming_buffers.hpp>
+#include <beast/core/prepare_buffers.hpp>
+#include <beast/core/static_streambuf.hpp>
+#include <beast/core/stream_concepts.hpp>
+#include <beast/core/streambuf.hpp>
 #include <boost/endian/buffers.hpp>
 #include <algorithm>
 #include <cassert>

include/beast/websocket/impl/teardown.ipp

@@ -8,8 +8,8 @@
 #ifndef BEAST_WEBSOCKET_IMPL_TEARDOWN_IPP
 #define BEAST_WEBSOCKET_IMPL_TEARDOWN_IPP
 
-#include <beast/async_completion.hpp>
-#include <beast/handler_concepts.hpp>
+#include <beast/core/async_completion.hpp>
+#include <beast/core/handler_concepts.hpp>
 #include <memory>
 
 namespace beast {

include/beast/websocket/impl/write_frame_op.ipp

@@ -8,11 +8,11 @@
 #ifndef BEAST_WEBSOCKET_IMPL_WRITE_FRAME_OP_HPP
 #define BEAST_WEBSOCKET_IMPL_WRITE_FRAME_OP_HPP
 
-#include <beast/buffer_cat.hpp>
-#include <beast/bind_handler.hpp>
-#include <beast/consuming_buffers.hpp>
-#include <beast/handler_alloc.hpp>
-#include <beast/static_streambuf.hpp>
+#include <beast/core/buffer_cat.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/consuming_buffers.hpp>
+#include <beast/core/handler_alloc.hpp>
+#include <beast/core/static_streambuf.hpp>
 #include <beast/websocket/detail/frame.hpp>
 #include <algorithm>
 #include <cassert>

include/beast/websocket/impl/write_op.ipp

@@ -8,9 +8,9 @@
 #ifndef BEAST_WEBSOCKET_IMPL_WRITE_OP_HPP
 #define BEAST_WEBSOCKET_IMPL_WRITE_OP_HPP
 
-#include <beast/consuming_buffers.hpp>
-#include <beast/prepare_buffers.hpp>
-#include <beast/handler_alloc.hpp>
+#include <beast/core/consuming_buffers.hpp>
+#include <beast/core/prepare_buffers.hpp>
+#include <beast/core/handler_alloc.hpp>
 #include <beast/websocket/detail/frame.hpp>
 #include <algorithm>
 #include <cassert>

include/beast/websocket/rfc6455.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_WEBSOCKET_RFC6455_HPP
 #define BEAST_WEBSOCKET_RFC6455_HPP
 
-#include <beast/static_string.hpp>
+#include <beast/core/static_string.hpp>
 #include <boost/optional.hpp>
 #include <array>
 #include <cstdint>

include/beast/websocket/stream.hpp

@@ -12,9 +12,9 @@
 #include <beast/websocket/detail/stream_base.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/string_body.hpp>
-#include <beast/streambuf_readstream.hpp>
-#include <beast/async_completion.hpp>
-#include <beast/detail/get_lowest_layer.hpp>
+#include <beast/core/streambuf_readstream.hpp>
+#include <beast/core/async_completion.hpp>
+#include <beast/core/detail/get_lowest_layer.hpp>
 #include <boost/asio.hpp>
 #include <boost/utility/string_ref.hpp>
 #include <algorithm>