From b5c87084afaef42b2d058f68091be31988a6a874 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 13 Sep 2017 11:08:07 +0900 Subject: Imported Upstream version 1.64.0 Change-Id: Id9212edd016dd55f21172c427aa7894d1d24148b Signed-off-by: DongHun Kwak --- boost/iostreams/filter/bzip2.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'boost/iostreams/filter/bzip2.hpp') diff --git a/boost/iostreams/filter/bzip2.hpp b/boost/iostreams/filter/bzip2.hpp index 7c1d1efc10..029338d1c6 100644 --- a/boost/iostreams/filter/bzip2.hpp +++ b/boost/iostreams/filter/bzip2.hpp @@ -87,9 +87,9 @@ const bool default_small = false; struct bzip2_params { // Non-explicit constructor for compression. - bzip2_params( int block_size = bzip2::default_block_size, - int work_factor = bzip2::default_work_factor ) - : block_size(block_size), work_factor(work_factor) + bzip2_params( int block_size_ = bzip2::default_block_size, + int work_factor_ = bzip2::default_work_factor ) + : block_size(block_size_), work_factor(work_factor_) { } // Constructor for decompression. @@ -242,7 +242,7 @@ public: typedef typename base_type::char_type char_type; typedef typename base_type::category category; basic_bzip2_compressor( const bzip2_params& = bzip2::default_block_size, - int buffer_size = default_device_buffer_size ); + std::streamsize buffer_size = default_device_buffer_size ); }; BOOST_IOSTREAMS_PIPABLE(basic_bzip2_compressor, 1) @@ -264,7 +264,7 @@ public: typedef typename base_type::char_type char_type; typedef typename base_type::category category; basic_bzip2_decompressor( bool small = bzip2::default_small, - int buffer_size = default_device_buffer_size ); + std::streamsize buffer_size = default_device_buffer_size ); }; BOOST_IOSTREAMS_PIPABLE(basic_bzip2_decompressor, 1) @@ -386,7 +386,7 @@ inline void bzip2_decompressor_impl::init() template basic_bzip2_compressor::basic_bzip2_compressor - (const bzip2_params& p, int buffer_size) + (const bzip2_params& p, std::streamsize buffer_size) : base_type(buffer_size, p) { } @@ -394,7 +394,7 @@ basic_bzip2_compressor::basic_bzip2_compressor template basic_bzip2_decompressor::basic_bzip2_decompressor - (bool small, int buffer_size) + (bool small, std::streamsize buffer_size) : base_type(buffer_size, small) { } -- cgit v1.2.3