summaryrefslogtreecommitdiff
path: root/boost/iostreams/filter/zlib.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/iostreams/filter/zlib.hpp')
-rw-r--r--boost/iostreams/filter/zlib.hpp16
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_;