update sources to v12.2.3

[ceph.git] / ceph / src / boost / libs / iostreams / src / bzip2.cpp

diff --git a/ceph/src/boost/libs/iostreams/src/bzip2.cpp b/ceph/src/boost/libs/iostreams/src/bzip2.cpp
index 7e4274919b33905b9a76882c72e61340905a953f..af80cd2f94b7931635fc342d7442ee8f56e1bbcd 100644 (file)
--- a/ceph/src/boost/libs/iostreams/src/bzip2.cpp
+++ b/ceph/src/boost/libs/iostreams/src/bzip2.cpp
@@ -135,23 +135,18 @@ int bzip2_base::decompress()
 
 void bzip2_base::do_init
     ( bool compress, 
-      #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-          bzip2::alloc_func /* alloc */, 
-          bzip2::free_func /* free */, 
-      #endif
+      bzip2::alloc_func /* alloc */, 
+      bzip2::free_func /* free */, 
       void* derived )
 {
     bz_stream* s = static_cast<bz_stream*>(stream_);
 
     // Current interface for customizing memory management 
     // is non-conforming and has been disabled:
-    //#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
     //    s->bzalloc = alloc;
     //    s->bzfree = free;
-    //#else
         s->bzalloc = 0;
         s->bzfree = 0;
-    //#endif
     s->opaque = derived;
     bzip2_error::check BOOST_PREVENT_MACRO_SUBSTITUTION( 
         compress ?