lp:~zorba-coders/zorba/bug1100471

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11405

Rodolfo Ochoa: Approve on 2013-04-24

Paul J. Lucas: Approve on 2013-04-24

Diff: 846 lines (+133/-86)

35 files modified

src/api/base64_streambuf.cpp (+9/-7)
src/api/module_info_impl.cpp (+1/-0)
src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp (+1/-1)
src/runtime/base64/base64_impl.cpp (+1/-1)
src/runtime/datetime/datetime_impl.cpp (+4/-4)
src/runtime/full_text/ft_module_impl.cpp (+4/-2)
src/runtime/numerics/format_integer.cpp (+1/-1)
src/runtime/parsing_and_serializing/parse_fragment_impl.cpp (+2/-2)
src/runtime/sequences/sequences_impl.cpp (+2/-2)
src/runtime/uris/uris_impl.cpp (+1/-1)
src/store/naive/atomic_items.cpp (+2/-2)
src/store/naive/json_items.cpp (+10/-7)
src/store/naive/loader_dtd.cpp (+4/-3)
src/store/naive/node_iterators.cpp (+3/-3)
src/store/naive/simple_collection.cpp (+3/-2)
src/store/naive/simple_index_value.cpp (+2/-1)
src/store/naive/simple_item_factory.cpp (+1/-1)
src/store/naive/simple_lazy_temp_seq.cpp (+3/-2)
src/store/naive/simple_temp_seq.cpp (+3/-3)
src/types/schema/schema.cpp (+1/-1)
src/unit_tests/test_base64_streambuf.cpp (+3/-1)
src/unit_tests/test_hashmaps.cpp (+2/-2)
src/unit_tests/test_icu_streambuf.cpp (+3/-1)
src/unit_tests/test_utf8_streambuf.cpp (+3/-3)
src/util/base64_util.cpp (+18/-7)
src/util/base64_util.h (+4/-2)
src/util/hexbinary_util.cpp (+17/-7)
src/util/hexbinary_util.h (+4/-2)
src/util/icu_streambuf.cpp (+4/-2)
src/util/mem_streambuf.cpp (+2/-2)
src/util/stream_util.cpp (+3/-1)
src/util/utf8_util.cpp (+5/-3)
src/zorbaserialization/bin_archiver.cpp (+2/-2)
src/zorbatypes/datetime/datetimetype.cpp (+2/-2)
src/zorbatypes/datetime/duration.cpp (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1100471: Warnings on Windows

Medium

Fix Released

Link a bug report

Related blueprints

11375. By Rodolfo Ochoa on 2013-04-17

Reverting parser & lexer changes

11374. By Rodolfo Ochoa on 2013-04-17

Merge from trunk

11373. By Rodolfo Ochoa on 2013-04-17

Merge from Paul's changes

11372. By Rodolfo Ochoa on 2013-04-16

-Fix for Windows warnings
-Correct size_type assigned

11371. By [u'Cezar Andrei <email address hidden>'] on 2013-04-15

Fix deep-equal bug 1090083. Approved: Sorin Marian Nasoi, Cezar Andrei

11370. By [u'Paul J. Lucas <email address hidden>'] on 2013-04-12

regex clean-up:

* Split off Zorba's own regex engine from ICU's.
* Clean-up of some of the hack changes that Daniel made.

Also fixed build when ZORBA_NO_ICU=1. Approved: Matthias Brantner, Paul J. Lucas

11369. By [u'Paul J. Lucas <email address hidden>'] on 2013-04-11

Fixed all FOTS test failures. Approved: Matthias Brantner, Paul J. Lucas

11368. By [u'Paul J. Lucas <email address hidden>'] on 2013-04-11

Fixed use of *+? inside []. Approved: Juan Zacarias, Paul J. Lucas

11367. By [u'Paul J. Lucas <email address hidden>'] on 2013-04-11

Rewrote format-number() code because it was simpler than trying to hack fix the old code. Approved: Matthias Brantner, Nicolae Brinza, Paul J. Lucas

11366. By [u'Markos Zaharioudakis <email address hidden>'] on 2013-04-11

Fixed bug in merging flwor expressions (no merging of the domain expr of a FOR clause, if the FOR clause allows empty) Approved: Markos Zaharioudakis