Subject: [Boost-commit] svn:boost r85812 - in trunk/boost/sync: detail detail/mutexes support
From: andrey.semashev_at_[hidden]
Date: 2013-09-21 15:26:42
Author: andysem
Date: 2013-09-21 15:26:42 EDT (Sat, 21 Sep 2013)
New Revision: 85812
URL: http://svn.boost.org/trac/boost/changeset/85812
Log:
Fixed compilation.
Text files modified:
trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp | 6 +++---
trunk/boost/sync/detail/mutexes/timed_mutex_windows.hpp | 4 ++--
trunk/boost/sync/detail/time_units.hpp | 2 +-
trunk/boost/sync/support/date_time.hpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
Modified: trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp
==============================================================================
--- trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp Sat Sep 21 15:03:30 2013 (r85811)
+++ trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp 2013-09-21 15:26:42 EDT (Sat, 21 Sep 2013) (r85812)
@@ -202,13 +202,13 @@
template< typename Duration >
typename detail::enable_if_tag< Duration, detail::time_duration_tag, bool >::type try_lock_for(Duration const& rel_time)
{
- return priv_timed_lock(sync::detail::time_traits< Duration >::to_sync_unit(t));
+ return priv_timed_lock(sync::detail::time_traits< Duration >::to_sync_unit(rel_time));
}
template< typename TimePoint >
typename detail::enable_if_tag< TimePoint, detail::time_point_tag, bool >::type try_lock_until(TimePoint const& abs_time)
{
- return priv_timed_lock(sync::detail::time_traits< TimePoint >::to_sync_unit(t));
+ return priv_timed_lock(sync::detail::time_traits< TimePoint >::to_sync_unit(abs_time));
}
native_handle_type native_handle() BOOST_NOEXCEPT
@@ -257,7 +257,7 @@
template< typename TimePoint >
bool priv_timed_lock(sync::detail::chrono_time_point< TimePoint > const& t)
{
- if (m_mutex.try_lock())
+ if (try_lock())
return true;
typedef TimePoint time_point;
Modified: trunk/boost/sync/detail/mutexes/timed_mutex_windows.hpp
==============================================================================
--- trunk/boost/sync/detail/mutexes/timed_mutex_windows.hpp Sat Sep 21 15:03:30 2013 (r85811)
+++ trunk/boost/sync/detail/mutexes/timed_mutex_windows.hpp 2013-09-21 15:26:42 EDT (Sat, 21 Sep 2013) (r85812)
@@ -79,13 +79,13 @@
template< typename Duration >
typename detail::enable_if_tag< Duration, detail::time_duration_tag, bool >::type try_lock_for(Duration const& rel_time)
{
- return priv_timed_lock(sync::detail::time_traits< Duration >::to_sync_unit(t));
+ return priv_timed_lock(sync::detail::time_traits< Duration >::to_sync_unit(rel_time));
}
template< typename TimePoint >
typename detail::enable_if_tag< TimePoint, detail::time_point_tag, bool >::type try_lock_until(TimePoint const& abs_time)
{
- return priv_timed_lock(sync::detail::time_traits< TimePoint >::to_sync_unit(t));
+ return priv_timed_lock(sync::detail::time_traits< TimePoint >::to_sync_unit(abs_time));
}
BOOST_DELETED_FUNCTION(timed_mutex(timed_mutex const&))
Modified: trunk/boost/sync/detail/time_units.hpp
==============================================================================
--- trunk/boost/sync/detail/time_units.hpp Sat Sep 21 15:03:30 2013 (r85811)
+++ trunk/boost/sync/detail/time_units.hpp 2013-09-21 15:26:42 EDT (Sat, 21 Sep 2013) (r85812)
@@ -247,7 +247,7 @@
}
template< typename T >
- explicit chrono_time_point(T const& arg) : base_type(arg)
+ explicit chrono_time_point(T const& arg) : m_value(arg)
{
}
Modified: trunk/boost/sync/support/date_time.hpp
==============================================================================
--- trunk/boost/sync/support/date_time.hpp Sat Sep 21 15:03:30 2013 (r85811)
+++ trunk/boost/sync/support/date_time.hpp 2013-09-21 15:26:42 EDT (Sat, 21 Sep 2013) (r85812)
@@ -75,7 +75,7 @@
traits_type::ticks_per_second / system_time_point::subsecond_fraction :
system_time_point::subsecond_fraction / traits_type::ticks_per_second
};
- return system_time_point(seconds, traits_type::ticks_per_second >= time_point::subsecond_fraction ?
+ return system_time_point(seconds, traits_type::ticks_per_second >= system_time_point::subsecond_fraction ?
fractional_seconds / conversion_ratio : fractional_seconds * conversion_ratio);
}
};