lp:~zorba-coders/zorba/bug-1103115

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11470

Matthias Brantner: Approve on 2013-05-23

Paul J. Lucas: Approve on 2013-05-22

Diff: 1341 lines (+434/-330)

20 files modified

ChangeLog (+1/-0)
include/zorba/dynamic_context.h (+4/-3)
include/zorba/item_factory.h (+6/-6)
src/api/itemfactoryimpl.cpp (+6/-8)
src/api/itemfactoryimpl.h (+3/-3)
src/context/dynamic_context.cpp (+1/-1)
src/runtime/datetime/datetime_impl.cpp (+5/-5)
src/runtime/durations_dates_times/format_dateTime.cpp (+2/-2)
src/store/api/item_factory.h (+9/-6)
src/store/naive/simple_item_factory.cpp (+6/-6)
src/store/naive/simple_item_factory.h (+3/-3)
src/util/hash/hash.h (+2/-0)
src/zorbaserialization/serialize_zorba_types.cpp (+2/-2)
src/zorbatypes/CMakeLists.txt (+2/-1)
src/zorbatypes/datetime/CMakeLists.txt (+3/-3)
src/zorbatypes/datetime/datetimetype.cpp (+37/-36)
src/zorbatypes/datetime/duration.cpp (+3/-4)
src/zorbatypes/timezone.cpp (+150/-180)
src/zorbatypes/timezone.h (+187/-59)
test/api/itemfactory.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1103115: Timezone units as hours are wrong

High

Fix Committed

Link a bug report

Related blueprints

11473. By Paul J. Lucas on 2013-05-22

More fixes.

11472. By Paul J. Lucas on 2013-05-22

FOTS changes.

11471. By Paul J. Lucas on 2013-05-22

Fixed merge.

11470. By Paul J. Lucas on 2013-05-22

Updated ChangeLog.

11469. By Paul J. Lucas on 2013-05-22

Merge from trunk.

11468. By Paul J. Lucas on 2013-05-22

Fixes.

11467. By Paul J. Lucas on 2013-05-22

Added more relational operators; added more comments.

11466. By Paul J. Lucas on 2013-05-22

Stupid math fixes.

11465. By Paul J. Lucas on 2013-05-22

TimeZone clean-up.

11464. By [u'Paul J. Lucas <email address hidden>'] on 2013-05-21

Undid some of my previous changes regarding which std exception is thrown by IntegerImpl. Now, invalid_argument is used when the argument is not a valid integer; range_error is used when the value is a valid integer, but out of range for the type (or a valid floating point constant like INF). Generally, invalid_argument will map to FOCA0002 and range_error will map to FORG0001.

This fixes several "wrongError" FOTS tests. Approved: Matthias Brantner, Paul J. Lucas