diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5b2258..5527fa1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Version 100: * Fix doc convenience includes * Fix doc includes +* Remove unused test header -------------------------------------------------------------------------------- diff --git a/test/beast/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt index 7ebf555b..c9de3848 100644 --- a/test/beast/zlib/CMakeLists.txt +++ b/test/beast/zlib/CMakeLists.txt @@ -22,7 +22,6 @@ add_executable (tests-beast-zlib ${ZLIB_SOURCES} ${TEST_MAIN} Jamfile - ztest.hpp error.cpp deflate_stream.cpp inflate_stream.cpp diff --git a/test/beast/zlib/deflate_stream.cpp b/test/beast/zlib/deflate_stream.cpp index 1d8a09da..9d840371 100644 --- a/test/beast/zlib/deflate_stream.cpp +++ b/test/beast/zlib/deflate_stream.cpp @@ -17,8 +17,6 @@ #include "zlib-1.2.11/zlib.h" -#include "ztest.hpp" - namespace boost { namespace beast { namespace zlib { diff --git a/test/beast/zlib/inflate_stream.cpp b/test/beast/zlib/inflate_stream.cpp index dc6c8522..546faa50 100644 --- a/test/beast/zlib/inflate_stream.cpp +++ b/test/beast/zlib/inflate_stream.cpp @@ -15,7 +15,7 @@ #include #include -#include "ztest.hpp" +#include "zlib-1.2.11/zlib.h" namespace boost { namespace beast { diff --git a/test/beast/zlib/ztest.hpp b/test/beast/zlib/ztest.hpp deleted file mode 100644 index 5a2077f0..00000000 --- a/test/beast/zlib/ztest.hpp +++ /dev/null @@ -1,84 +0,0 @@ -// -// Copyright (c) 2016-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) -// -// Official repository: https://github.com/boostorg/beast -// - -#ifndef BOOST_BEAST_ZTEST_HPP -#define BOOST_BEAST_ZTEST_HPP - -#include "zlib-1.2.11/zlib.h" - -#include - -class z_deflator -{ - int level_ = Z_DEFAULT_COMPRESSION; - int windowBits_ = 15; - int memLevel_ = 4; - int strategy_ = Z_DEFAULT_STRATEGY; - -public: - // -1 = default - // 0 = none - // 1..9 = faster<-->better - void - level(int n) - { - level_ = n; - } - - void - windowBits(int n) - { - windowBits_ = n; - } - - void - memLevel(int n) - { - memLevel_ = n; - } - - void - strategy(int n) - { - strategy_ = n; - } - - std::string - operator()(std::string const& in) - { - int result; - z_stream zs; - memset(&zs, 0, sizeof(zs)); - result = deflateInit2( - &zs, - level_, - Z_DEFLATED, - -windowBits_, - memLevel_, - strategy_ - ); - if(result != Z_OK) - throw std::logic_error("deflateInit2 failed"); - std::string out; - out.resize(deflateBound(&zs, - static_cast(in.size()))); - zs.next_in = (Bytef*)in.data(); - zs.avail_in = static_cast(in.size()); - zs.next_out = (Bytef*)&out[0]; - zs.avail_out = static_cast(out.size()); - result = deflate(&zs, Z_FULL_FLUSH); - if(result != Z_OK) - throw std::logic_error("deflate failed"); - out.resize(zs.total_out); - deflateEnd(&zs); - return out; - } -}; - -#endif