Subject: [Boost-commit] svn:boost r84948 - in branches/maintenance/1_54_0: . boost boost/date_time boost/date_time/local_time
From: dnljms_at_[hidden]
Date: 2013-07-03 18:02:30
Author: danieljames
Date: 2013-07-03 18:02:30 EDT (Wed, 03 Jul 2013)
New Revision: 84948
URL: http://svn.boost.org/trac/boost/changeset/84948
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
>From [84626], by marshall.
Properties modified:
branches/maintenance/1_54_0/ (props changed)
branches/maintenance/1_54_0/boost/ (props changed)
branches/maintenance/1_54_0/boost/date_time/ (props changed)
Text files modified:
branches/maintenance/1_54_0/boost/date_time/local_time/custom_time_zone.hpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Modified: branches/maintenance/1_54_0/boost/date_time/local_time/custom_time_zone.hpp
==============================================================================
--- branches/maintenance/1_54_0/boost/date_time/local_time/custom_time_zone.hpp Wed Jul 3 17:57:56 2013 (r84947)
+++ branches/maintenance/1_54_0/boost/date_time/local_time/custom_time_zone.hpp 2013-07-03 18:02:30 EDT (Wed, 03 Jul 2013) (r84948)
@@ -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