Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85045 - branches/release/boost/date_time/local_time
From: marshall_at_[hidden]
Date: 2013-07-15 09:55:21


Author: marshall
Date: 2013-07-15 09:55:21 EDT (Mon, 15 Jul 2013)
New Revision: 85045
URL: http://svn.boost.org/trac/boost/changeset/85045

Log:
Merge fix for C++11 compilation error

Properties modified:
   branches/release/boost/date_time/local_time/custom_time_zone.hpp (contents, props changed)
Text files modified:
   branches/release/boost/date_time/local_time/custom_time_zone.hpp | 2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: branches/release/boost/date_time/local_time/custom_time_zone.hpp
==============================================================================
--- branches/release/boost/date_time/local_time/custom_time_zone.hpp Mon Jul 15 09:44:41 2013 (r85044)
+++ branches/release/boost/date_time/local_time/custom_time_zone.hpp 2013-07-15 09:55:21 EDT (Mon, 15 Jul 2013) (r85045)
@@ -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