diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:41:18 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:43:11 +0900 |
commit | f763a99a501650eff2c60288aa6f10ef916d769e (patch) | |
tree | 02af7e13f9a38c888ebf340fe764cbe7dae99da9 /boost/iostreams/filter/zlib.hpp | |
parent | 5cde13f21d36c7224b0e13d11c4b49379ae5210d (diff) | |
download | boost-f763a99a501650eff2c60288aa6f10ef916d769e.tar.gz boost-f763a99a501650eff2c60288aa6f10ef916d769e.tar.bz2 boost-f763a99a501650eff2c60288aa6f10ef916d769e.zip |
Imported Upstream version 1.62.0upstream/1.62.0
Change-Id: I9d4c1ddb7b7d8f0069217ecc582700f9fda6dd4c
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/iostreams/filter/zlib.hpp')
-rw-r--r-- | boost/iostreams/filter/zlib.hpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/boost/iostreams/filter/zlib.hpp b/boost/iostreams/filter/zlib.hpp index b0327f3cb8..848af89255 100644 --- a/boost/iostreams/filter/zlib.hpp +++ b/boost/iostreams/filter/zlib.hpp @@ -11,7 +11,7 @@ #ifndef BOOST_IOSTREAMS_ZLIB_HPP_INCLUDED #define BOOST_IOSTREAMS_ZLIB_HPP_INCLUDED -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif @@ -35,7 +35,7 @@ // Must come last. #ifdef BOOST_MSVC # pragma warning(push) -# pragma warning(disable:4251 4231 4660) // Dependencies not exported. +# pragma warning(disable:4251 4275 4231 4660) // Dependencies not exported. #endif #include <boost/config/abi_prefix.hpp> @@ -183,10 +183,8 @@ protected: { bool custom = zlib_allocator<Alloc>::custom; do_init( p, compress, - #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) - custom ? zlib_allocator<Alloc>::allocate : 0, - custom ? zlib_allocator<Alloc>::deallocate : 0, - #endif + custom ? zlib_allocator<Alloc>::allocate : 0, + custom ? zlib_allocator<Alloc>::deallocate : 0, &zalloc ); } void before( const char*& src_begin, const char* src_end, @@ -202,10 +200,8 @@ public: int total_out() const { return total_out_; } private: void do_init( const zlib_params& p, bool compress, - #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) - zlib::xalloc_func, - zlib::xfree_func, - #endif + zlib::xalloc_func, + zlib::xfree_func, void* derived ); void* stream_; // Actual type: z_stream*. bool calculate_crc_; |