update boost

linx64/include/boost/chrono/config.hpp

@@ -12,6 +12,7 @@
 #ifndef BOOST_CHRONO_CONFIG_HPP
 #define BOOST_CHRONO_CONFIG_HPP
 
+#include <boost/chrono/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
 #include <boost/predef.h>
 
@@ -212,5 +213,6 @@
 #include <boost/config/auto_link.hpp>
 #endif  // auto-linking disabled
 #endif // BOOST_CHRONO_HEADER_ONLY
+
 #endif // BOOST_CHRONO_CONFIG_HPP
 

linx64/include/boost/chrono/detail/inlined/mac/chrono.hpp

@@ -30,7 +30,7 @@ system_clock::time_point
 system_clock::now() BOOST_NOEXCEPT
 {
     timeval tv;
-    gettimeofday(&tv, 0);
+    gettimeofday(&tv, BOOST_NULLPTR);
     return time_point(seconds(tv.tv_sec) + microseconds(tv.tv_usec));
 }
 
@@ -39,7 +39,7 @@ system_clock::time_point
 system_clock::now(system::error_code & ec)
 {
     timeval tv;
-    gettimeofday(&tv, 0);
+    gettimeofday(&tv, BOOST_NULLPTR);
     if (!::boost::chrono::is_throws(ec))
     {
         ec.clear();
@@ -166,7 +166,7 @@ init_steady_clock(kern_return_t & err)
     err = mach_timebase_info(&MachInfo);
     if ( err != 0  )
     {
-        return 0;
+        return BOOST_NULLPTR;
     }
 
     if (MachInfo.numer == MachInfo.denom)
@@ -185,7 +185,7 @@ init_steady_clock_ec(kern_return_t & err)
     err = mach_timebase_info(&MachInfo);
     if ( err != 0  )
     {
-        return 0;
+        return BOOST_NULLPTR;
     }
 
     if (MachInfo.numer == MachInfo.denom)

linx64/include/boost/chrono/detail/inlined/win/chrono.hpp

@@ -15,6 +15,7 @@
 #include <boost/winapi/time.hpp>
 #include <boost/winapi/timers.hpp>
 #include <boost/winapi/get_last_error.hpp>
+#include <boost/winapi/error_codes.hpp>
 #include <boost/assert.hpp>
 
 namespace boost
@@ -70,7 +71,7 @@ namespace chrono_detail
     {
         boost::winapi::DWORD_ cause =
             ((nanosecs_per_tic <= 0.0L)
-                    ? ERROR_NOT_SUPPORTED
+                    ? boost::winapi::ERROR_NOT_SUPPORTED_
                     : boost::winapi::GetLastError());
         if (::boost::chrono::is_throws(ec)) {
             boost::throw_exception(

linx64/include/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp

@@ -19,10 +19,10 @@
 #include <time.h>
 #include <boost/assert.hpp>
 
-#include <boost/detail/winapi/get_last_error.hpp>
-#include <boost/detail/winapi/get_current_process.hpp>
+#include <boost/winapi/get_last_error.hpp>
+#include <boost/winapi/get_current_process.hpp>
 #if BOOST_PLAT_WINDOWS_DESKTOP
-#include <boost/detail/winapi/get_process_times.hpp>
+#include <boost/winapi/get_process_times.hpp>
 #endif
 
 namespace boost
@@ -72,10 +72,10 @@ process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_NOEXCEPT
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetProcessTimes(
-            boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
+    if ( boost::winapi::GetProcessTimes(
+            boost::winapi::GetCurrentProcess(), &creation, &exit,
             &system_time, &user_time ) )
     {
         return time_point(duration(
@@ -97,10 +97,10 @@ process_user_cpu_clock::time_point process_user_cpu_clock::now(
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetProcessTimes(
-            boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
+    if ( boost::winapi::GetProcessTimes(
+            boost::winapi::GetCurrentProcess(), &creation, &exit,
             &system_time, &user_time ) )
     {
         if (!::boost::chrono::is_throws(ec))
@@ -114,7 +114,7 @@ process_user_cpu_clock::time_point process_user_cpu_clock::now(
     }
     else
     {
-        boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
+        boost::winapi::DWORD_ cause = boost::winapi::GetLastError();
         if (::boost::chrono::is_throws(ec))
         {
             boost::throw_exception(
@@ -137,10 +137,10 @@ process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_NOEXC
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetProcessTimes(
-            boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
+    if ( boost::winapi::GetProcessTimes(
+            boost::winapi::GetCurrentProcess(), &creation, &exit,
             &system_time, &user_time ) )
     {
         return time_point(duration(
@@ -162,10 +162,10 @@ process_system_cpu_clock::time_point process_system_cpu_clock::now(
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetProcessTimes(
-            boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
+    if ( boost::winapi::GetProcessTimes(
+            boost::winapi::GetCurrentProcess(), &creation, &exit,
             &system_time, &user_time ) )
     {
         if (!::boost::chrono::is_throws(ec))
@@ -179,7 +179,7 @@ process_system_cpu_clock::time_point process_system_cpu_clock::now(
     }
     else
     {
-        boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
+        boost::winapi::DWORD_ cause = boost::winapi::GetLastError();
         if (::boost::chrono::is_throws(ec))
         {
             boost::throw_exception(
@@ -202,10 +202,10 @@ process_cpu_clock::time_point process_cpu_clock::now()  BOOST_NOEXCEPT
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetProcessTimes(
-            boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
+    if ( boost::winapi::GetProcessTimes(
+            boost::winapi::GetCurrentProcess(), &creation, &exit,
             &system_time, &user_time ) )
     {
         time_point::rep r(process_real_cpu_clock::now().time_since_epoch().count()
@@ -233,10 +233,10 @@ process_cpu_clock::time_point process_cpu_clock::now(
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetProcessTimes(
-            boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
+    if ( boost::winapi::GetProcessTimes(
+            boost::winapi::GetCurrentProcess(), &creation, &exit,
             &system_time, &user_time ) )
     {
         if (!::boost::chrono::is_throws(ec))
@@ -256,7 +256,7 @@ process_cpu_clock::time_point process_cpu_clock::now(
     }
     else
     {
-        boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
+        boost::winapi::DWORD_ cause = boost::winapi::GetLastError();
         if (::boost::chrono::is_throws(ec))
         {
             boost::throw_exception(

linx64/include/boost/chrono/detail/inlined/win/thread_clock.hpp

@@ -16,9 +16,9 @@
 #include <cassert>
 #include <boost/assert.hpp>
 
-#include <boost/detail/winapi/get_last_error.hpp>
-#include <boost/detail/winapi/get_current_thread.hpp>
-#include <boost/detail/winapi/get_thread_times.hpp>
+#include <boost/winapi/get_last_error.hpp>
+#include <boost/winapi/get_current_thread.hpp>
+#include <boost/winapi/get_thread_times.hpp>
 
 namespace boost
 {
@@ -29,10 +29,10 @@ namespace chrono
 thread_clock::time_point thread_clock::now( system::error_code & ec )
 {
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetThreadTimes(
-            boost::detail::winapi::GetCurrentThread (), &creation, &exit,
+    if ( boost::winapi::GetThreadTimes(
+            boost::winapi::GetCurrentThread (), &creation, &exit,
             &system_time, &user_time ) )
     {
         duration user = duration(
@@ -56,13 +56,13 @@ thread_clock::time_point thread_clock::now( system::error_code & ec )
         {
             boost::throw_exception(
                     system::system_error(
-                            boost::detail::winapi::GetLastError(),
+                            boost::winapi::GetLastError(),
                             ::boost::system::system_category(),
                             "chrono::thread_clock" ));
         }
         else
         {
-            ec.assign( boost::detail::winapi::GetLastError(), ::boost::system::system_category() );
+            ec.assign( boost::winapi::GetLastError(), ::boost::system::system_category() );
             return thread_clock::time_point(duration(0));
         }
     }
@@ -73,10 +73,10 @@ thread_clock::time_point thread_clock::now() BOOST_NOEXCEPT
 {
 
     //  note that Windows uses 100 nanosecond ticks for FILETIME
-    boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
+    boost::winapi::FILETIME_ creation, exit, user_time, system_time;
 
-    if ( boost::detail::winapi::GetThreadTimes(
-            boost::detail::winapi::GetCurrentThread (), &creation, &exit,
+    if ( boost::winapi::GetThreadTimes(
+            boost::winapi::GetCurrentThread (), &creation, &exit,
             &system_time, &user_time ) )
     {
         duration user   = duration(

linx64/include/boost/chrono/detail/requires_cxx11.hpp

@@ -0,0 +1,23 @@
+#ifndef BOOST_CHRONO_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+#define BOOST_CHRONO_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+
+// Copyright 2023 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
+
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || \
+    defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
+    defined(BOOST_NO_CXX11_DECLTYPE) || \
+    defined(BOOST_NO_CXX11_CONSTEXPR) || \
+    defined(BOOST_NO_CXX11_NOEXCEPT) || \
+    defined(BOOST_NO_CXX11_HDR_CHRONO) || \
+    defined(BOOST_NO_CXX11_HDR_RATIO)
+
+BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.Chrono 1.82 and will be removed in Boost.Chrono 1.84.")
+
+#endif
+
+#endif // #ifndef BOOST_CHRONO_DETAIL_REQUIRES_CXX11_HPP_INCLUDED

linx64/include/boost/chrono/detail/scan_keyword.hpp

@@ -67,12 +67,14 @@ scan_keyword(InputIterator& b, InputIterator e,
     unsigned char* status = statbuf;
     //  Change free by free_aux to avoid
     // Error: Could not find a match for boost::interprocess::unique_ptr<unsigned char, void(*)(void*)>::unique_ptr(int, extern "C" void(void*))
-    unique_ptr<unsigned char, void(*)(void*)> stat_hold(0, free_aux);
+    unique_ptr<unsigned char, void(*)(void*)> stat_hold(BOOST_NULLPTR, free_aux);
     if (nkw > sizeof(statbuf))
     {
         status = (unsigned char*)malloc(nkw);
-        if (status == 0)
+        if (status == BOOST_NULLPTR)
+        {
           throw_exception(std::bad_alloc());
+        }
         stat_hold.reset(status);
     }
     size_t n_might_match = nkw;  // At this point, any keyword might match

linx64/include/boost/chrono/duration.hpp

@@ -47,7 +47,7 @@ time2_demo contained this comment:
 #include <boost/chrono/detail/is_evenly_divisible_by.hpp>
 
 #include <boost/cstdint.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/integer_traits.hpp>
 
@@ -324,8 +324,8 @@ namespace detail
 //                                                                            //
 //----------------------------------------------------------------------------//
 //----------------------------------------------------------------------------//
-//      20.9.2.1 treat_as_floating_point [time.traits.is_fp]                        //
-//      Probably should have been treat_as_floating_point. Editor notifed.    //
+//      20.9.2.1 treat_as_floating_point [time.traits.is_fp]                  //
+//      Probably should have been treat_as_floating_point. Editor notified.   //
 //----------------------------------------------------------------------------//
 
     // Support bidirectional (non-exact) conversions for floating point rep types
@@ -455,7 +455,7 @@ namespace chrono {
                             >
                         >
                     >
-                >::type* = 0
+                >::type* = BOOST_NULLPTR
             ) : rep_(r) { }
 #if  defined   BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
         duration& operator=(const duration& rhs)
@@ -463,9 +463,12 @@ namespace chrono {
             if (&rhs != this) rep_= rhs.rep_;
             return *this;
         }
+        duration(const duration& rhs) : rep_(rhs.rep_) {}
 #else
         duration& operator=(const duration& rhs) = default;
+        duration(const duration&) = default;
 #endif
+
         // conversions
         template <class Rep2, class Period2>
         BOOST_FORCEINLINE BOOST_CONSTEXPR
@@ -478,7 +481,7 @@ namespace chrono {
                             mpl::not_ < treat_as_floating_point<Rep2> >
                         >
                     >
-                >::type* = 0
+                >::type* = BOOST_NULLPTR
         )
             : rep_(chrono::detail::duration_cast<duration<Rep2, Period2>, duration>()(d).count()) {}
 
@@ -490,7 +493,7 @@ namespace chrono {
         // arithmetic
 
         BOOST_CONSTEXPR
-        duration  operator+() const {return duration(rep_);;}
+        duration  operator+() const {return duration(rep_);}
         BOOST_CONSTEXPR
         duration  operator-() const {return duration(-rep_);}
         duration& operator++()      {++rep_; return *this;}

linx64/include/boost/chrono/io/duration_get.hpp

@@ -11,7 +11,7 @@
 #include <boost/chrono/config.hpp>
 #include <string>
 #include <boost/type_traits/is_scalar.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_signed.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/integer/common_factor_rt.hpp>

linx64/include/boost/chrono/io/duration_io.hpp

@@ -17,7 +17,7 @@
 #include <boost/chrono/io/duration_put.hpp>
 #include <boost/chrono/io/duration_get.hpp>
 #include <boost/chrono/io/utility/manip_base.hpp>
-#include <boost/detail/no_exceptions_support.hpp>
+#include <boost/core/no_exceptions_support.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <locale>
@@ -166,7 +166,7 @@ namespace boost
           {
             os.setstate(std::ios_base::failbit);
           }
-          BOOST_CATCH (std::ios_base::failure )
+          BOOST_CATCH (const std::ios_base::failure& )
           {
             flag = true;
           }
@@ -221,7 +221,7 @@ namespace boost
           {
             os.setstate(std::ios_base::failbit);
           }
-          BOOST_CATCH (std::ios_base::failure )
+          BOOST_CATCH (const std::ios_base::failure& )
           {
             flag = true;
           }
@@ -276,7 +276,7 @@ namespace boost
         {
           is.setstate(std::ios_base::failbit);
         }
-        BOOST_CATCH (std::ios_base::failure )
+        BOOST_CATCH (const std::ios_base::failure& )
         {
           flag = true;
         }

linx64/include/boost/chrono/io/duration_put.hpp

@@ -102,7 +102,7 @@ namespace boost
        */
       template <typename Rep, typename Period>
       iter_type put(iter_type s, std::ios_base& ios, char_type fill, duration<Rep, Period> const& d, const CharT* pattern,
-          const CharT* pat_end, const char_type* val = 0) const
+          const CharT* pat_end, const char_type* val = BOOST_NULLPTR) const
       {
         if (std::has_facet<duration_units<CharT> >(ios.getloc()))
         {
@@ -119,7 +119,7 @@ namespace boost
 
       template <typename Rep, typename Period>
       iter_type put(duration_units<CharT> const& units_facet, iter_type s, std::ios_base& ios, char_type fill,
-          duration<Rep, Period> const& d, const CharT* pattern, const CharT* pat_end, const char_type* val = 0) const
+          duration<Rep, Period> const& d, const CharT* pattern, const CharT* pat_end, const char_type* val = BOOST_NULLPTR) const
       {
 
         const std::ctype<char_type>& ct = std::use_facet<std::ctype<char_type> >(ios.getloc());
@@ -170,7 +170,7 @@ namespace boost
        * @Returns An iterator pointing immediately after the last character produced.
        */
       template <typename Rep, typename Period>
-      iter_type put(iter_type s, std::ios_base& ios, char_type fill, duration<Rep, Period> const& d, const char_type* val = 0) const
+      iter_type put(iter_type s, std::ios_base& ios, char_type fill, duration<Rep, Period> const& d, const char_type* val = BOOST_NULLPTR) const
       {
         if (std::has_facet<duration_units<CharT> >(ios.getloc()))
         {
@@ -198,7 +198,7 @@ namespace boost
        * @Returns s, iterator pointing immediately after the last character produced.
        */
       template <typename Rep, typename Period>
-      iter_type put_value(iter_type s, std::ios_base& ios, char_type fill, duration<Rep, Period> const& d, const char_type* val = 0) const
+      iter_type put_value(iter_type s, std::ios_base& ios, char_type fill, duration<Rep, Period> const& d, const char_type* val = BOOST_NULLPTR) const
       {
         if (val)
         {
@@ -213,7 +213,7 @@ namespace boost
       }
 
       template <typename Rep, typename Period>
-      iter_type put_value(iter_type s, std::ios_base& ios, char_type fill, duration<process_times<Rep>, Period> const& d, const char_type* = 0) const
+      iter_type put_value(iter_type s, std::ios_base& ios, char_type fill, duration<process_times<Rep>, Period> const& d, const char_type* = BOOST_NULLPTR) const
       {
         *s++ = CharT('{');
         s = put_value(s, ios, fill, process_real_cpu_clock::duration(d.count().real));

linx64/include/boost/chrono/io/duration_style.hpp

@@ -10,7 +10,7 @@
 #ifndef BOOST_CHRONO_IO_DURATION_STYLE_HPP
 #define BOOST_CHRONO_IO_DURATION_STYLE_HPP
 
-#include <boost/detail/scoped_enum_emulation.hpp>
+#include <boost/core/scoped_enum.hpp>
 
 namespace boost
 {

linx64/include/boost/chrono/io/duration_units.hpp

@@ -983,9 +983,9 @@ namespace boost
             if (duration_units_default_holder<CharT>::initialized_)
             {
               delete[] duration_units_default_holder<CharT>::n_d_valid_units_;
-              duration_units_default_holder<CharT>::n_d_valid_units_ = 0;
+              duration_units_default_holder<CharT>::n_d_valid_units_ = BOOST_NULLPTR;
               delete[] duration_units_default_holder<CharT>::valid_units_;
-              duration_units_default_holder<CharT>::valid_units_ = 0;
+              duration_units_default_holder<CharT>::valid_units_ = BOOST_NULLPTR;
               duration_units_default_holder<CharT>::initialized_ = false;
             }
         }

linx64/include/boost/chrono/io/time_point_io.hpp

@@ -29,7 +29,7 @@
 #include <boost/chrono/round.hpp>
 #include <boost/chrono/detail/scan_keyword.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/no_exceptions_support.hpp>
+#include <boost/core/no_exceptions_support.hpp>
 #include <cstring>
 #include <locale>
 #include <ctime>
@@ -683,7 +683,7 @@ namespace boost
           {
             os.setstate(std::ios_base::failbit);
           }
-          BOOST_CATCH (std::ios_base::failure )
+          BOOST_CATCH (const std::ios_base::failure& )
           {
             flag = true;
           }
@@ -732,7 +732,7 @@ namespace boost
         {
           is.setstate(std::ios_base::failbit);
         }
-        BOOST_CATCH (std::ios_base::failure )
+        BOOST_CATCH (const std::ios_base::failure& )
         {
           flag = true;
         }

linx64/include/boost/chrono/io/timezone.hpp

@@ -9,7 +9,8 @@
 
 #ifndef BOOST_CHRONO_IO_TIMEZONE_HPP
 #define BOOST_CHRONO_IO_TIMEZONE_HPP
-#include <boost/detail/scoped_enum_emulation.hpp>
+
+#include <boost/core/scoped_enum.hpp>
 
 namespace boost
 {

linx64/include/boost/chrono/io/utility/ios_base_state_ptr.hpp

@@ -116,9 +116,9 @@ namespace boost
       {
         register_once(index(), ios_);
         void* &pw = ios_.pword(index());
-        if (pw == 0)
+        if (pw == BOOST_NULLPTR)
         {
-          return 0;
+          return BOOST_NULLPTR;
         }
         return static_cast<T*> (pw);
       }
@@ -243,18 +243,18 @@ namespace boost
         case std::ios_base::erase_event:
         {
           void*& pw = ios.pword(index);
-          if (pw != 0)
+          if (pw != BOOST_NULLPTR)
           {
             T* ptr = static_cast<T*> (pw);
             delete ptr;
-            pw = 0;
+            pw = BOOST_NULLPTR;
           }
           break;
         }
         case std::ios_base::copyfmt_event:
         {
           void*& pw = ios.pword(index);
-          if (pw != 0)
+          if (pw != BOOST_NULLPTR)
           {
             pw = new T(*static_cast<T*> (pw));
           }
@@ -303,7 +303,7 @@ namespace boost
       explicit ios_state_not_null_ptr(std::ios_base& ios) :
       base_type(ios)
       {
-        if (this->get() == 0)
+        if (this->get() == BOOST_NULLPTR)
         {
           this->base_type::reset(new T());
         }
@@ -314,7 +314,7 @@ namespace boost
 
       void reset(T* new_value) BOOST_NOEXCEPT
       {
-        BOOST_ASSERT(new_value!=0);
+        BOOST_ASSERT(new_value!=BOOST_NULLPTR);
         this->base_type::reset(new_value);
       }
 

linx64/include/boost/chrono/io_v1/chrono_io.hpp

@@ -24,7 +24,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/integer/common_factor_rt.hpp>
 #include <boost/chrono/detail/scan_keyword.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp>
 
 namespace boost
@@ -52,7 +52,7 @@ private:
 
     template <class Period>
         string_type short_name(Period) const
-            {return ::boost::ratio_string<Period, CharT>::short_name() + short_seconds_;}
+            {return ::boost::ratio_string<Period, CharT>::symbol() + short_seconds_;}
 
     string_type short_name(ratio<1>) const    {return short_seconds_;}
     string_type short_name(ratio<60>) const   {return short_minutes_;}
@@ -60,7 +60,7 @@ private:
 
     template <class Period>
         string_type long_name(Period) const
-            {return ::boost::ratio_string<Period, CharT>::long_name() + long_seconds_;}
+            {return ::boost::ratio_string<Period, CharT>::prefix() + long_seconds_;}
 
     string_type long_name(ratio<1>) const    {return long_seconds_;}
     string_type long_name(ratio<60>) const   {return long_minutes_;}

linx64/include/boost/chrono/time_point.hpp

@@ -182,7 +182,7 @@ namespace chrono {
                 , typename boost::enable_if
                 <
                     boost::is_convertible<Duration2, duration>
-                >::type* = 0
+                >::type* = BOOST_NULLPTR
         )
             : d_(t.time_since_epoch())
         {