update boost

linx64/include/boost/format/alt_sstream.hpp

@@ -16,6 +16,7 @@
 #define BOOST_SK_ALT_SSTREAM_HPP
 
 #include <string>
+#include <boost/core/allocator_access.hpp>
 #include <boost/format/detail/compat_workarounds.hpp>
 #include <boost/utility/base_from_member.hpp>
 #include <boost/shared_ptr.hpp>

linx64/include/boost/format/alt_sstream_impl.hpp

@@ -38,10 +38,10 @@ namespace boost {
             size_type sz=s.size();
             if(sz != 0 && mode_ & (::std::ios_base::in | ::std::ios_base::out) ) {
 #ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC
-                void *vd_ptr = alloc_.allocate(sz, is_allocated_? eback() : 0);
+                void *vd_ptr = boost::allocator_allocate(alloc_, sz, is_allocated_? eback() : 0);
                 Ch *new_ptr = static_cast<Ch *>(vd_ptr);
 #else
-                Ch *new_ptr = alloc_.allocate(sz, is_allocated_? eback() : 0);
+                Ch *new_ptr = boost::allocator_allocate(alloc_, sz, is_allocated_? eback() : 0);
 #endif
                 // if this didnt throw, we're safe, update the buffer
                 dealloc();
@@ -255,10 +255,10 @@ namespace boost {
                 if(0 < add_size) {
                     new_size += add_size;
 #ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC
-                    void *vdptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0);
+                    void *vdptr = boost::allocator_allocate(alloc_, new_size, is_allocated_? oldptr : 0);
                     newptr = static_cast<Ch *>(vdptr);
 #else
-                    newptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0);
+                    newptr = boost::allocator_allocate(alloc_, new_size, is_allocated_? oldptr : 0);
 #endif
                 }
 

linx64/include/boost/format/detail/config_macros.hpp

@@ -38,14 +38,14 @@
 #endif
 
 #if defined(BOOST_NO_STD_LOCALE) || \
- ( BOOST_WORKAROUND(__BORLANDC__, <= 0x564) \
-   || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT( 0x570 ) )  )
-// some future __BORLANDC__ >0x564  versions might not need this
+ ( BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x564) \
+   || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT( 0x570 ) )  )
+// some future BOOST_BORLANDC >0x564  versions might not need this
 // 0x570 is Borland's kylix branch
 #define BOOST_NO_LOCALE_ISDIGIT
 #endif
 
-#if  BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570) ) || BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1300))
+#if  BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x570) ) || BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1300))
 #define BOOST_NO_OVERLOAD_FOR_NON_CONST
 #endif
 

linx64/include/boost/format/exceptions.hpp

@@ -17,6 +17,7 @@
 #define BOOST_FORMAT_EXCEPTIONS_HPP
 
 
+#include <boost/config.hpp>
 #include <stdexcept>
 
 
@@ -30,7 +31,7 @@ namespace boost {
         {
         public:
             format_error()  {}
-            virtual const char *what() const throw() {
+            virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {
                 return "boost::format_error: "
                     "format generic failure";
             }
@@ -44,7 +45,7 @@ namespace boost {
                 : pos_(pos), next_(size) {}
             std::size_t get_pos() const { return pos_; }
             std::size_t get_next() const { return next_; }
-            virtual const char *what() const throw() {
+            virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {
                 return "boost::bad_format_string: format-string is ill-formed";
             }
         };
@@ -57,7 +58,7 @@ namespace boost {
                 : cur_(cur), expected_(expected) {}
             std::size_t get_cur() const { return cur_; }
             std::size_t get_expected() const { return expected_; }
-            virtual const char *what() const throw() {
+            virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {
                 return "boost::too_few_args: "
                     "format-string referred to more arguments than were passed";
             }
@@ -71,7 +72,7 @@ namespace boost {
                 : cur_(cur), expected_(expected) {}
             std::size_t get_cur() const { return cur_; }
             std::size_t get_expected() const { return expected_; }
-            virtual const char *what() const throw() {
+            virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {
                 return "boost::too_many_args: "
                     "format-string referred to fewer arguments than were passed";
             }
@@ -87,7 +88,7 @@ namespace boost {
             int get_index() const { return index_; }
             int get_beg() const { return beg_; }
             int get_end() const { return end_; }
-            virtual const char *what() const throw() {
+            virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {
                 return "boost::out_of_range: "
                     "tried to refer to an argument (or item) number which"
                     " is out of range, according to the format string";

linx64/include/boost/format/format_class.hpp

@@ -119,7 +119,7 @@ namespace boost {
         unsigned char exceptions(unsigned char newexcept);
 
 #if !defined( BOOST_NO_MEMBER_TEMPLATE_FRIENDS )  \
-    && !BOOST_WORKAROUND(__BORLANDC__, <= 0x570) \
+    && !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x570) \
     && !BOOST_WORKAROUND( _CRAYC, != 0) \
     && !BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
         // use friend templates and private members only if supported