net::ssl::stream is canonical in snippets

test/doc/core_3_timeouts.cpp

@@ -18,7 +18,6 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/http.hpp>
-#include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/read.hpp>
 #include <boost/asio/spawn.hpp>
@@ -311,8 +310,7 @@ https_get (std::string const& host, std::string const& target, error_code& ec)
     boost::asio::spawn(ioc,
     [&](boost::asio::yield_context yield)
     {
-        // We use the Beast ssl_stream wrapped around a beast tcp_stream.
+        net::ssl::stream<tcp_stream> stream(ioc, ctx);
-        ssl_stream<tcp_stream> stream(ioc, ctx);
 
         // The resolver will be used to look up the IP addresses for the host name
         net::ip::tcp::resolver resolver(ioc);

test/doc/core_snippets.cpp

@@ -7,18 +7,10 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-// prevent ssl.hpp from actually being included,
-// otherwise we would need OpenSSL on AppVeyor
-#ifndef BOOST_ASIO_SSL_HPP
-#define BOOST_ASIO_SSL_HPP
-namespace boost { namespace asio { namespace ssl { } } }
-#endif
-
 //[snippet_core_1a
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <iostream>
@@ -89,7 +81,7 @@ void ssl_tls_shutdown()
 {
     net::io_context ioc;
     net::ssl::context ctx(net::ssl::context::tlsv12);
-    ssl_stream<tcp_stream> stream(ioc, ctx);
+    net::ssl::stream<tcp_stream> stream(ioc, ctx);
     flat_buffer buffer;
     http::response<http::dynamic_body> res;
     auto log = [](error_code){};

test/doc/websocket.cpp

@@ -19,7 +19,6 @@
 //[code_websocket_1a
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 
@@ -78,7 +77,7 @@ snippets()
     //[code_websocket_5f
 
         // The WebSocket stream will use SSL and a new strand
-        stream<ssl_stream<tcp_stream>> wss(net::make_strand(ioc), ctx);
+        stream<net::ssl::stream<tcp_stream>> wss(net::make_strand(ioc), ctx);
 
     //]
 

test/doc/websocket_1_connecting.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_2_handshaking.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_3_decorator.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_4_messages.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_5_control_frames.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_6_timeouts.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_7_teardown.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 

test/doc/websocket_8_notes.cpp

@@ -17,7 +17,6 @@
 #include <boost/beast/_experimental/unit_test/suite.hpp>
 
 #include <boost/beast.hpp>
-#include <boost/beast/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/asio/spawn.hpp>