|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r84626 - trunk/boost/date_time/local_time
From: marshall_at_[hidden]
Date: 2013-06-04 00:34:30
Author: marshall
Date: 2013-06-04 00:34:29 EDT (Tue, 04 Jun 2013)
New Revision: 84626
URL: http://svn.boost.org/trac/boost/changeset/84626
Log:
In C++11 the shared_ptr -> bool conversion is explicit. In custom time zone code, make the cast explicit. Fixes compilation failure in C++11
Text files modified:
trunk/boost/date_time/local_time/custom_time_zone.hpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Modified: trunk/boost/date_time/local_time/custom_time_zone.hpp
==============================================================================
--- trunk/boost/date_time/local_time/custom_time_zone.hpp (original)
+++ trunk/boost/date_time/local_time/custom_time_zone.hpp 2013-06-04 00:34:29 EDT (Tue, 04 Jun 2013)
@@ -64,7 +64,7 @@
//! True if zone uses daylight savings adjustments
virtual bool has_dst() const
{
- return (dst_calc_rules_); //if calc_rule is set the tz has dst
+ return (bool) dst_calc_rules_; //if calc_rule is set the tz has dst
}
//! Local time that DST starts -- NADT if has_dst is false
virtual posix_time::ptime dst_local_start_time(gregorian::greg_year y) const
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk