update boost on linux
This commit is contained in:
@@ -12,9 +12,9 @@
|
||||
#ifndef BOOST_CHRONO_DETAIL_INLINED_WIN_CHRONO_HPP
|
||||
#define BOOST_CHRONO_DETAIL_INLINED_WIN_CHRONO_HPP
|
||||
|
||||
#include <boost/detail/winapi/time.hpp>
|
||||
#include <boost/detail/winapi/timers.hpp>
|
||||
#include <boost/detail/winapi/get_last_error.hpp>
|
||||
#include <boost/winapi/time.hpp>
|
||||
#include <boost/winapi/timers.hpp>
|
||||
#include <boost/winapi/get_last_error.hpp>
|
||||
#include <boost/assert.hpp>
|
||||
|
||||
namespace boost
|
||||
@@ -26,8 +26,8 @@ namespace chrono_detail
|
||||
|
||||
BOOST_CHRONO_INLINE double get_nanosecs_per_tic() BOOST_NOEXCEPT
|
||||
{
|
||||
boost::detail::winapi::LARGE_INTEGER_ freq;
|
||||
if ( !boost::detail::winapi::QueryPerformanceFrequency( &freq ) )
|
||||
boost::winapi::LARGE_INTEGER_ freq;
|
||||
if ( !boost::winapi::QueryPerformanceFrequency( &freq ) )
|
||||
return 0.0L;
|
||||
return double(1000000000.0L / freq.QuadPart);
|
||||
}
|
||||
@@ -38,14 +38,14 @@ namespace chrono_detail
|
||||
{
|
||||
double nanosecs_per_tic = chrono_detail::get_nanosecs_per_tic();
|
||||
|
||||
boost::detail::winapi::LARGE_INTEGER_ pcount;
|
||||
boost::winapi::LARGE_INTEGER_ pcount;
|
||||
if ( nanosecs_per_tic <= 0.0L )
|
||||
{
|
||||
BOOST_ASSERT(0 && "Boost::Chrono - get_nanosecs_per_tic Internal Error");
|
||||
return steady_clock::time_point();
|
||||
}
|
||||
unsigned times=0;
|
||||
while ( ! boost::detail::winapi::QueryPerformanceCounter( &pcount ) )
|
||||
while ( ! boost::winapi::QueryPerformanceCounter( &pcount ) )
|
||||
{
|
||||
if ( ++times > 3 )
|
||||
{
|
||||
@@ -64,29 +64,29 @@ namespace chrono_detail
|
||||
{
|
||||
double nanosecs_per_tic = chrono_detail::get_nanosecs_per_tic();
|
||||
|
||||
boost::detail::winapi::LARGE_INTEGER_ pcount;
|
||||
boost::winapi::LARGE_INTEGER_ pcount;
|
||||
if ( (nanosecs_per_tic <= 0.0L)
|
||||
|| (!boost::detail::winapi::QueryPerformanceCounter( &pcount )) )
|
||||
|| (!boost::winapi::QueryPerformanceCounter( &pcount )) )
|
||||
{
|
||||
boost::detail::winapi::DWORD_ cause =
|
||||
boost::winapi::DWORD_ cause =
|
||||
((nanosecs_per_tic <= 0.0L)
|
||||
? ERROR_NOT_SUPPORTED
|
||||
: boost::detail::winapi::GetLastError());
|
||||
if (BOOST_CHRONO_IS_THROWS(ec)) {
|
||||
: boost::winapi::GetLastError());
|
||||
if (::boost::chrono::is_throws(ec)) {
|
||||
boost::throw_exception(
|
||||
system::system_error(
|
||||
cause,
|
||||
BOOST_CHRONO_SYSTEM_CATEGORY,
|
||||
::boost::system::system_category(),
|
||||
"chrono::steady_clock" ));
|
||||
}
|
||||
else
|
||||
{
|
||||
ec.assign( cause, BOOST_CHRONO_SYSTEM_CATEGORY );
|
||||
ec.assign( cause, ::boost::system::system_category() );
|
||||
return steady_clock::time_point(duration(0));
|
||||
}
|
||||
}
|
||||
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
@@ -98,8 +98,8 @@ namespace chrono_detail
|
||||
BOOST_CHRONO_INLINE
|
||||
system_clock::time_point system_clock::now() BOOST_NOEXCEPT
|
||||
{
|
||||
boost::detail::winapi::FILETIME_ ft;
|
||||
boost::detail::winapi::GetSystemTimeAsFileTime( &ft ); // never fails
|
||||
boost::winapi::FILETIME_ ft;
|
||||
boost::winapi::GetSystemTimeAsFileTime( &ft ); // never fails
|
||||
return system_clock::time_point(
|
||||
system_clock::duration(
|
||||
((static_cast<__int64>( ft.dwHighDateTime ) << 32) | ft.dwLowDateTime)
|
||||
@@ -113,9 +113,9 @@ namespace chrono_detail
|
||||
BOOST_CHRONO_INLINE
|
||||
system_clock::time_point system_clock::now( system::error_code & ec )
|
||||
{
|
||||
boost::detail::winapi::FILETIME_ ft;
|
||||
boost::detail::winapi::GetSystemTimeAsFileTime( &ft ); // never fails
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
boost::winapi::FILETIME_ ft;
|
||||
boost::winapi::GetSystemTimeAsFileTime( &ft ); // never fails
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
|
||||
@@ -53,10 +53,10 @@ process_real_cpu_clock::time_point process_real_cpu_clock::now(
|
||||
boost::throw_exception(
|
||||
system::system_error(
|
||||
errno,
|
||||
BOOST_CHRONO_SYSTEM_CATEGORY,
|
||||
::boost::system::system_category(),
|
||||
"chrono::process_real_cpu_clock" ));
|
||||
}
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
@@ -103,7 +103,7 @@ process_user_cpu_clock::time_point process_user_cpu_clock::now(
|
||||
boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
|
||||
&system_time, &user_time ) )
|
||||
{
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
@@ -115,17 +115,17 @@ process_user_cpu_clock::time_point process_user_cpu_clock::now(
|
||||
else
|
||||
{
|
||||
boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
|
||||
if (BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (::boost::chrono::is_throws(ec))
|
||||
{
|
||||
boost::throw_exception(
|
||||
system::system_error(
|
||||
cause,
|
||||
BOOST_CHRONO_SYSTEM_CATEGORY,
|
||||
::boost::system::system_category(),
|
||||
"chrono::process_user_cpu_clock" ));
|
||||
}
|
||||
else
|
||||
{
|
||||
ec.assign( cause, BOOST_CHRONO_SYSTEM_CATEGORY );
|
||||
ec.assign( cause, ::boost::system::system_category() );
|
||||
return time_point();
|
||||
}
|
||||
}
|
||||
@@ -168,7 +168,7 @@ process_system_cpu_clock::time_point process_system_cpu_clock::now(
|
||||
boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
|
||||
&system_time, &user_time ) )
|
||||
{
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
@@ -180,17 +180,17 @@ process_system_cpu_clock::time_point process_system_cpu_clock::now(
|
||||
else
|
||||
{
|
||||
boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
|
||||
if (BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (::boost::chrono::is_throws(ec))
|
||||
{
|
||||
boost::throw_exception(
|
||||
system::system_error(
|
||||
cause,
|
||||
BOOST_CHRONO_SYSTEM_CATEGORY,
|
||||
::boost::system::system_category(),
|
||||
"chrono::process_system_cpu_clock" ));
|
||||
}
|
||||
else
|
||||
{
|
||||
ec.assign( cause, BOOST_CHRONO_SYSTEM_CATEGORY );
|
||||
ec.assign( cause, ::boost::system::system_category() );
|
||||
return time_point();
|
||||
}
|
||||
}
|
||||
@@ -239,7 +239,7 @@ process_cpu_clock::time_point process_cpu_clock::now(
|
||||
boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
|
||||
&system_time, &user_time ) )
|
||||
{
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
@@ -257,17 +257,17 @@ process_cpu_clock::time_point process_cpu_clock::now(
|
||||
else
|
||||
{
|
||||
boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
|
||||
if (BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (::boost::chrono::is_throws(ec))
|
||||
{
|
||||
boost::throw_exception(
|
||||
system::system_error(
|
||||
cause,
|
||||
BOOST_CHRONO_SYSTEM_CATEGORY,
|
||||
::boost::system::system_category(),
|
||||
"chrono::process_cpu_clock" ));
|
||||
}
|
||||
else
|
||||
{
|
||||
ec.assign( cause, BOOST_CHRONO_SYSTEM_CATEGORY );
|
||||
ec.assign( cause, ::boost::system::system_category() );
|
||||
return time_point();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ thread_clock::time_point thread_clock::now( system::error_code & ec )
|
||||
((static_cast<duration::rep>(system_time.dwHighDateTime) << 32)
|
||||
| system_time.dwLowDateTime) * 100 );
|
||||
|
||||
if (!BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (!::boost::chrono::is_throws(ec))
|
||||
{
|
||||
ec.clear();
|
||||
}
|
||||
@@ -52,17 +52,17 @@ thread_clock::time_point thread_clock::now( system::error_code & ec )
|
||||
}
|
||||
else
|
||||
{
|
||||
if (BOOST_CHRONO_IS_THROWS(ec))
|
||||
if (::boost::chrono::is_throws(ec))
|
||||
{
|
||||
boost::throw_exception(
|
||||
system::system_error(
|
||||
boost::detail::winapi::GetLastError(),
|
||||
BOOST_CHRONO_SYSTEM_CATEGORY,
|
||||
::boost::system::system_category(),
|
||||
"chrono::thread_clock" ));
|
||||
}
|
||||
else
|
||||
{
|
||||
ec.assign( boost::detail::winapi::GetLastError(), BOOST_CHRONO_SYSTEM_CATEGORY );
|
||||
ec.assign( boost::detail::winapi::GetLastError(), ::boost::system::system_category() );
|
||||
return thread_clock::time_point(duration(0));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user