From: anthony_at_[hidden]
Date: 2007-10-19 11:31:36
Author: anthonyw
Date: 2007-10-19 11:31:35 EDT (Fri, 19 Oct 2007)
New Revision: 40189
URL: http://svn.boost.org/trac/boost/changeset/40189
Log:
more tweaks to remove warnings
Text files modified:
trunk/boost/thread/thread_time.hpp | 6 +++---
trunk/boost/thread/xtime.hpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: trunk/boost/thread/thread_time.hpp
==============================================================================
--- trunk/boost/thread/thread_time.hpp (original)
+++ trunk/boost/thread/thread_time.hpp 2007-10-19 11:31:35 EDT (Fri, 19 Oct 2007)
@@ -19,18 +19,18 @@
return system_time(boost::posix_time::pos_infin);
}
- inline system_time::time_duration_type::tick_type get_milliseconds_until(system_time const& target_time)
+ inline unsigned long get_milliseconds_until(system_time const& target_time)
{
if(target_time.is_pos_infinity())
{
- return ~(system_time::time_duration_type::tick_type)0;
+ return ~(unsigned long)0;
}
system_time const now=get_system_time();
if(target_time<=now)
{
return 0;
}
- return (target_time-now).total_milliseconds()+1;
+ return static_cast<unsigned long>((target_time-now).total_milliseconds()+1);
}
}
Modified: trunk/boost/thread/xtime.hpp
==============================================================================
--- trunk/boost/thread/xtime.hpp (original)
+++ trunk/boost/thread/xtime.hpp 2007-10-19 11:31:35 EDT (Fri, 19 Oct 2007)
@@ -56,8 +56,8 @@
xtime res={0};
boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
- res.sec=time_since_epoch.total_seconds();
- res.nsec=time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second());
+ res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds());
+ res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second()));
return res;
}