- Fix "changes meaning of keywords" in boost date_time

- Related: #450718
This commit is contained in:
Petr Machata 2008-06-12 11:12:04 +00:00
parent ed00540465
commit a59558692b
2 changed files with 44 additions and 1 deletions

View File

@ -174,3 +174,42 @@ diff -urp boost_1_34_1/boost/python/detail/def_helper.hpp boost_1_34_1-pm/boost/
, char const*
, void(not_specified::*)() // A function pointer type which is never an
// appropriate default implementation
diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp
--- boost_1_34_1/boost/date_time/tz_db_base.hpp 2008-06-12 13:03:34.000000000 +0200
+++ boost_1_34_1-pm/boost/date_time/tz_db_base.hpp 2008-06-12 12:59:43.000000000 +0200
@@ -158,7 +158,7 @@ namespace boost {
typedef typename time_zone_type::base_type time_zone_base_type;
typedef typename time_zone_type::time_duration_type time_duration_type;
typedef time_zone_names_base<char_type> time_zone_names;
- typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
+ typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
typedef std::basic_string<char_type> string_type;
//! Constructs an empty database
@@ -346,18 +346,18 @@ namespace boost {
time_duration_type utc_offset =
str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]);
- dst_adjustment_offsets adjust(time_duration_type(0,0,0),
- time_duration_type(0,0,0),
- time_duration_type(0,0,0));
+ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0),
+ time_duration_type(0,0,0),
+ time_duration_type(0,0,0));
boost::shared_ptr<rule_type> rules;
if(has_dst){
- adjust = dst_adjustment_offsets(
- str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
- str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
- str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
- );
+ adjust = dst_adjustment_offsets_t(
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
+ );
rules =
boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],

View File

@ -3,7 +3,7 @@
Name: boost
Summary: The Boost C++ Libraries
Version: 1.34.1
Release: 15%{?dist}
Release: 16%{?dist}
License: Boost
URL: http://www.boost.org/
Group: System Environment/Libraries
@ -198,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}
%changelog
* Thu Jun 12 2008 Petr Machata <pmachata@redhat.com> - 1.34.1-16
- Fix "changes meaning of keywords" in boost date_time
- Related: #450718
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.34.1-15
- fix license tag