From 0fa658f644e38da33cea439cc0aefe02a0e893c9 Mon Sep 17 00:00:00 2001 From: Richard Hodges Date: Tue, 2 Jun 2020 19:32:04 +0200 Subject: [PATCH] Remove buffers_adapter.hpp (API Change): API Changes: The file `core/buffers_adapter.hpp` has been removed along with the deprecated alias typename `buffers_adapter`. Affected programs should use `core/buffers_adapator.hpp` and the type `buffers_adaptor`. refs #1934 --- CHANGELOG.md | 5 +++ include/boost/beast/core/buffers_adapter.hpp | 35 -------------------- test/beast/core/CMakeLists.txt | 1 - test/beast/core/Jamfile | 1 - test/beast/core/buffers_adapter.cpp | 23 ------------- 5 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 include/boost/beast/core/buffers_adapter.hpp delete mode 100644 test/beast/core/buffers_adapter.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index df6c10e3..b0d6fa2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +* Remove buffers_adapter.hpp (API Change) * Remove zlib error `invalid_code_lenths`(sic) (API Change) * Remove `core/type_traits.hpp` (API Change) * Remove `reset` function from `flat_static_buffer` (API Change) @@ -10,6 +11,10 @@ API Changes: +* The file `core/buffers_adapter.hpp` has been removed along with the deprecated + alias typename `buffers_adapter`. Affected programs should use + `core/buffers_adapator.hpp` and the type `buffers_adaptor`. + * The error code enum `invalid_code_lenths` was a synonym of `invalid_code_lengths`. Affected programs should be modified to use `invalid_code_lengths`. diff --git a/include/boost/beast/core/buffers_adapter.hpp b/include/boost/beast/core/buffers_adapter.hpp deleted file mode 100644 index 6c584bb2..00000000 --- a/include/boost/beast/core/buffers_adapter.hpp +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright (c) 2016-2019 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) -// -// Official repository: https://github.com/boostorg/beast -// - -#ifndef BOOST_BEAST_BUFFERS_ADAPTER_HPP -#define BOOST_BEAST_BUFFERS_ADAPTER_HPP - -#include - -#ifdef BOOST_BEAST_ALLOW_DEPRECATED - -#include - -namespace boost { -namespace beast { - -template -using buffers_adapter = buffers_adaptor; - -} // beast -} // boost - -#else - -// The new filename is -#error The file is deprecated, define BOOST_BEAST_ALLOW_DEPRECATED to disable this error - -#endif - -#endif diff --git a/test/beast/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt index 8c0844c4..ffc12ad2 100644 --- a/test/beast/core/CMakeLists.txt +++ b/test/beast/core/CMakeLists.txt @@ -33,7 +33,6 @@ add_executable (tests-beast-core bind_handler.cpp buffer_traits.cpp buffered_read_stream.cpp - buffers_adapter.cpp buffers_adaptor.cpp buffers_cat.cpp buffers_prefix.cpp diff --git a/test/beast/core/Jamfile b/test/beast/core/Jamfile index 9d8db7f4..9ec47c1a 100644 --- a/test/beast/core/Jamfile +++ b/test/beast/core/Jamfile @@ -24,7 +24,6 @@ local SOURCES = bind_handler.cpp buffer_traits.cpp buffered_read_stream.cpp - buffers_adapter.cpp buffers_adaptor.cpp buffers_cat.cpp buffers_prefix.cpp diff --git a/test/beast/core/buffers_adapter.cpp b/test/beast/core/buffers_adapter.cpp deleted file mode 100644 index d5ceff3c..00000000 --- a/test/beast/core/buffers_adapter.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (c) 2016-2019 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) -// -// Official repository: https://github.com/boostorg/beast -// - -#ifndef BOOST_BEAST_ALLOW_DEPRECATED -#define BOOST_BEAST_ALLOW_DEPRECATED -#endif - -// Test that header file is self-contained. -#include - -namespace boost { -namespace beast { - -BOOST_STATIC_ASSERT(sizeof(buffers_adapter) > 0); - -} // beast -} // boost