import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / beast / zlib / inflate_stream.hpp

diff --git a/ceph/src/boost/boost/beast/zlib/inflate_stream.hpp b/ceph/src/boost/boost/beast/zlib/inflate_stream.hpp
index 8410cb8bc2a78ebad2b450ac4724905e58c246dd..70c74f62c42c2cbe9a6406fb52077872255eb224 100644 (file)
--- a/ceph/src/boost/boost/beast/zlib/inflate_stream.hpp
+++ b/ceph/src/boost/boost/beast/zlib/inflate_stream.hpp
@@ -1,18 +1,11 @@
 //
-// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+// 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_ZLIB_INFLATE_STREAM_HPP
-#define BOOST_BEAST_ZLIB_INFLATE_STREAM_HPP
-
-#include <boost/beast/core/detail/config.hpp>
-#include <boost/beast/zlib/detail/inflate_stream.hpp>
-
 // This is a derivative work based on Zlib, copyright below:
 /*
     Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -41,6 +34,12 @@
     (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
+#ifndef BOOST_BEAST_ZLIB_INFLATE_STREAM_HPP
+#define BOOST_BEAST_ZLIB_INFLATE_STREAM_HPP
+
+#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/zlib/detail/inflate_stream.hpp>
+
 namespace boost {
 namespace beast {
 namespace zlib {
@@ -183,7 +182,7 @@ public:
         the effects of the flush parameter in this implementation are on the return value
         of `write` as noted below, when `write` returns early when `Flush::block` or
         `Flush::trees` is used, and when `write` avoids the allocation of memory for a
-        sliding window when `Flush::finsih` is used.
+        sliding window when `Flush::finish` is used.
 
         If a preset dictionary is needed after this call,
         `write` sets `zs.adler` to the Adler-32 checksum of the dictionary chosen by