update boost

linx64/include/boost/iostreams/detail/adapter/concept_adapter.hpp

@@ -117,8 +117,8 @@ public:
 
     std::streamsize optimal_buffer_size() const
     { return iostreams::optimal_buffer_size(t_); }
-public:
-    concept_adapter& operator=(const concept_adapter&);
+private:
+    BOOST_DELETED_FUNCTION(concept_adapter& operator=(const concept_adapter&))
     value_type t_;
 };
 

linx64/include/boost/iostreams/detail/adapter/range_adapter.hpp

@@ -10,20 +10,20 @@
 
 #if defined(_MSC_VER)
 # pragma once
-#endif              
+#endif
 
 #include <algorithm>                             // min.
 #include <boost/assert.hpp>
 #include <cstddef>                               // ptrdiff_t.
 #include <iosfwd>                                // streamsize, streamoff.
-#include <boost/detail/iterator.hpp>             // boost::iterator_traits.
+#include <iterator>                              // iterator_traits.
 #include <boost/iostreams/categories.hpp>
 #include <boost/iostreams/detail/error.hpp>
 #include <boost/iostreams/positioning.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 
 // Must come last.
 #include <boost/iostreams/detail/config/disable_warnings.hpp>  // MSVC.
@@ -44,7 +44,7 @@ template<typename Mode, typename Range>
 class range_adapter {
 private:
     typedef typename Range::iterator                  iterator;
-    typedef boost::detail::iterator_traits<iterator>  iter_traits;
+    typedef std::iterator_traits<iterator>            iter_traits;
     typedef typename iter_traits::iterator_category   iter_cat;
 public:
     typedef typename Range::value_type                char_type;

linx64/include/boost/iostreams/detail/bool_trait_def.hpp

@@ -21,7 +21,7 @@
 // Description: Used to generate the traits classes is_istream, is_ostream,
 //      etc.
 //
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x582))
 # define BOOST_IOSTREAMS_TRAIT_NAMESPACE(trait)
 #else
 # define BOOST_IOSTREAMS_TRAIT_NAMESPACE(trait) BOOST_PP_CAT(trait, _impl_):: 

linx64/include/boost/iostreams/detail/config/auto_link.hpp

@@ -17,7 +17,7 @@
 
 #if defined(BOOST_EXTERNAL_LIB_NAME)
 # if defined(BOOST_MSVC) \
-     || defined(__BORLANDC__) \
+     || defined(__BORLANDC__) && !defined(__clang__) \
      || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
      || (defined(__ICL) && defined(_MSC_EXTENSIONS)) \
      /**/

linx64/include/boost/iostreams/detail/config/bzip2.hpp

@@ -15,9 +15,11 @@
 # pragma once
 #endif              
 
+#include <boost/config.hpp> // BOOST_STRINGIZE.
+
 #if defined(BOOST_BZIP2_BINARY)
 # if defined(BOOST_MSVC) || \
-     defined(__BORLANDC__) || \
+     defined(BOOST_BORLANDC) || \
      (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) || \
      (defined(__ICL) && defined(_MSC_EXTENSIONS)) \
      /**/

linx64/include/boost/iostreams/detail/config/codecvt.hpp

@@ -68,7 +68,7 @@ namespace std {
 
 #if defined(__LIBCOMO__)
     using ::mbstate_t;
-#elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(__BORLANDC__)
+#elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(BOOST_BORLANDC)
     using ::mbstate_t;
 #elif defined(__SGI_STL_PORT)
 #elif defined(BOOST_NO_STDC_NAMESPACE)

linx64/include/boost/iostreams/detail/config/disable_warnings.hpp

@@ -20,7 +20,7 @@
 #  pragma warning(disable:6334)   // sizeof applied to an expression with an operator.
 # endif
 #else
-# if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+# if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
 #  pragma warn -8008     // Condition always true/false.
 #  pragma warn -8066     // Unreachable code.
 #  pragma warn -8071     // Conversion may lose significant digits.

linx64/include/boost/iostreams/detail/config/enable_warnings.hpp

@@ -8,7 +8,7 @@
 #if defined(BOOST_MSVC)
 # pragma warning(pop)
 #else
-# if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+# if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
 #  pragma warn .8008     // Condition always true/false.
 #  pragma warn .8066     // Unreachable code.
 #  pragma warn .8071     // Conversion may lose significant digits.

linx64/include/boost/iostreams/detail/config/fpos.hpp

@@ -26,7 +26,8 @@
 
 # if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \
      !defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_VX_CPU) && !defined(__VXWORKS__) \
-     && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141)
+     && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) \
+     && !defined(_LIBCPP_VERSION)
      /**/
 
 #include <boost/iostreams/detail/ios.hpp>

linx64/include/boost/iostreams/detail/config/overload_resolution.hpp

@@ -21,7 +21,7 @@
 
 #if !defined(BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION)
 # if BOOST_WORKAROUND(__MWERKS__, <= 0x3003) || \
-     BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
+     BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) \
      /**/
 #  define BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION
 # endif

linx64/include/boost/iostreams/detail/config/rtl.hpp

@@ -23,7 +23,7 @@
 #include <boost/iostreams/detail/config/windows_posix.hpp>
 
 // Handle open, close, read, and write
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 # define BOOST_IOSTREAMS_RTL(x) BOOST_JOIN(_rtl_, x)
 #elif defined BOOST_IOSTREAMS_WINDOWS
 # define BOOST_IOSTREAMS_RTL(x) BOOST_JOIN(_, x)

linx64/include/boost/iostreams/detail/config/zlib.hpp

@@ -19,7 +19,7 @@
 
 #if defined(BOOST_ZLIB_BINARY)
 # if defined(BOOST_MSVC) || \
-     defined(__BORLANDC__) || \
+     defined(BOOST_BORLANDC) || \
      (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) || \
      (defined(__ICL) && defined(_MSC_EXTENSIONS)) \
      /**/

linx64/include/boost/iostreams/detail/enable_if_stream.hpp

@@ -13,11 +13,12 @@
 #endif              
 
 #include <boost/config.hpp>                // BOOST_NO_SFINAE.
+#include <boost/config/workaround.hpp>
 #include <boost/utility/enable_if.hpp>                  
 #include <boost/iostreams/traits_fwd.hpp>  // is_std_io.
 
 #if !defined(BOOST_NO_SFINAE) && \
-    !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
+    !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x592))
 # define BOOST_IOSTREAMS_ENABLE_IF_STREAM(T) \
     , typename boost::enable_if< boost::iostreams::is_std_io<T> >::type* = 0 \
     /**/

linx64/include/boost/iostreams/detail/execute.hpp

@@ -67,7 +67,7 @@ struct execute_traits_impl<void> {
 template< typename Op, 
           typename Result = // VC6.5 workaround.
               #if !defined(BOOST_NO_RESULT_OF) && \
-                  !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
+                  !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x592))
                   typename boost::result_of<Op()>::type
               #else
                   BOOST_DEDUCED_TYPENAME Op::result_type

linx64/include/boost/iostreams/detail/forward.hpp

@@ -102,7 +102,7 @@
 // Disable forwarding constructors if first parameter type is the same
 // as the device type
 #if !defined(BOOST_NO_SFINAE) && \
-    !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
+    !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x592))
 # define BOOST_IOSTREAMS_DISABLE_IF_SAME(device, param) \
     , typename boost::disable_if< boost::is_same<device, param> >::type* = 0 \
     /**/

linx64/include/boost/iostreams/detail/functional.hpp

@@ -38,7 +38,7 @@ public:
         { }
     void operator()() const { boost::iostreams::close(t_, which_); }
 private:
-    device_close_operation& operator=(const device_close_operation&);
+    BOOST_DELETED_FUNCTION(device_close_operation& operator=(const device_close_operation&))
     T&                   t_;
     BOOST_IOS::openmode  which_;
 };
@@ -52,7 +52,7 @@ public:
         { }
     void operator()() const { boost::iostreams::close(t_, snk_, which_); }
 private:
-    filter_close_operation& operator=(const filter_close_operation&);
+    BOOST_DELETED_FUNCTION(filter_close_operation& operator=(const filter_close_operation&))
     T&                   t_;
     Sink&                snk_;
     BOOST_IOS::openmode  which_;
@@ -78,7 +78,7 @@ public:
     device_close_all_operation(T& t) : t_(t) { }
     void operator()() const { detail::close_all(t_); }
 private:
-    device_close_all_operation& operator=(const device_close_all_operation&);
+    BOOST_DELETED_FUNCTION(device_close_all_operation& operator=(const device_close_all_operation&))
     T& t_;
 };
 
@@ -89,7 +89,7 @@ public:
     filter_close_all_operation(T& t, Sink& snk) : t_(t), snk_(snk) { }
     void operator()() const { detail::close_all(t_, snk_); }
 private:
-    filter_close_all_operation& operator=(const filter_close_all_operation&);
+    BOOST_DELETED_FUNCTION(filter_close_all_operation& operator=(const filter_close_all_operation&))
     T&     t_;
     Sink&  snk_;
 };
@@ -115,7 +115,7 @@ public:
         { }
     void operator()() const { t_.close(which_); }
 private:
-    member_close_operation& operator=(const member_close_operation&);
+    BOOST_DELETED_FUNCTION(member_close_operation& operator=(const member_close_operation&))
     T&                   t_;
     BOOST_IOS::openmode  which_;
 };
@@ -133,7 +133,7 @@ public:
     reset_operation(T& t) : t_(t) { }
     void operator()() const { t_.reset(); }
 private:
-    reset_operation& operator=(const reset_operation&);
+    BOOST_DELETED_FUNCTION(reset_operation& operator=(const reset_operation&))
     T& t_;
 };
 
@@ -149,7 +149,7 @@ public:
     clear_flags_operation(T& t) : t_(t) { }
     void operator()() const { t_ = 0; }
 private:
-    clear_flags_operation& operator=(const clear_flags_operation&);
+    BOOST_DELETED_FUNCTION(clear_flags_operation& operator=(const clear_flags_operation&))
     T& t_;
 };
 
@@ -173,7 +173,7 @@ public:
             buf_.flush(dev_);
     }
 private:
-    flush_buffer_operation& operator=(const flush_buffer_operation&);
+    BOOST_DELETED_FUNCTION(flush_buffer_operation& operator=(const flush_buffer_operation&))
     Buffer&  buf_;
     Device&  dev_;
     bool     flush_;

linx64/include/boost/iostreams/detail/ios.hpp

@@ -32,7 +32,7 @@ namespace boost { namespace iostreams { namespace detail {
 #ifndef BOOST_IOSTREAMS_NO_STREAM_TEMPLATES //--------------------------------//
 # define BOOST_IOSTREAMS_BASIC_IOS(ch, tr)  std::basic_ios< ch, tr >
 # if !BOOST_WORKAROUND(__MWERKS__, <= 0x3003) && \
-     !BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
+     !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) \
      /**/
 
 #define BOOST_IOS                std::ios

linx64/include/boost/iostreams/detail/optional.hpp

@@ -83,7 +83,7 @@ public:
     void reset() 
     {
         if (initialized_) { 
-        #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || \
+        #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) || \
             BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) \
             /**/
             T* t = static_cast<T*>(address());

linx64/include/boost/iostreams/detail/push.hpp

@@ -53,7 +53,7 @@
                   BOOST_IOSTREAMS_PUSH_ARGS() ); \
     /**/
 
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) \
     /**/
 # ifndef BOOST_IOSTREAMS_NO_STREAM_TEMPLATES
 #  define BOOST_IOSTREAMS_DEFINE_PUSH_IMPL(name, mode, ch, helper, has_return, result) \

linx64/include/boost/iostreams/detail/resolve.hpp

@@ -167,7 +167,7 @@ struct resolve_traits {
                 is_array<T>,
                 array_adapter<Mode, T>,
                 else_,
-                #if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+                #if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
                     const T&
                 #else
                     T
@@ -196,7 +196,7 @@ typename resolve_traits<Mode, Ch, T>::type
 resolve(const T& t BOOST_IOSTREAMS_DISABLE_IF_STREAM(T))
 { return resolve<Mode, Ch>(t, is_std_io<T>()); }
 
-# if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \
+# if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) && \
      !defined(__GNUC__) // ---------------------------------------------------//
 
 template<typename Mode, typename Ch, typename T>

linx64/include/boost/iostreams/detail/restrict_impl.hpp

@@ -465,7 +465,7 @@ BOOST_IOSTREAMS_RESTRICT( const T& t, stream_offset off, stream_offset len = -1
                           BOOST_IOSTREAMS_DISABLE_IF_STREAM(T) )
 { return BOOST_IOSTREAMS_RESTRICT(t, off, len, is_std_io<T>()); }
 
-# if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \
+# if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) && \
      !defined(__GNUC__) // ---------------------------------------------------//
 
 template<typename T>

linx64/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp

@@ -390,11 +390,18 @@ inline void indirect_streambuf<T, Tr, Alloc, Mode>::close_impl
         sync();
         setp(0, 0);
     }
+    #if defined(BOOST_MSVC)
+      #pragma warning(push)
+      #pragma warning(disable: 4127) // conditional expression is constant
+    #endif
     if ( !is_convertible<category, dual_use>::value ||
          is_convertible<Mode, input>::value == (which == BOOST_IOS::in) )
     {
         obj().close(which, next_);
     }
+    #if defined(BOOST_MSVC)
+      #pragma warning(pop)
+    #endif
 }
 
 //----------State changing functions------------------------------------------//