lp:~paul-lucas/zorba/bug-1000478

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10851

Matthias Brantner: Approve on 2012-05-17

Paul J. Lucas: Approve on 2012-05-17

Diff: 320 lines (+129/-123)

4 files modified

src/runtime/full_text/ft_module_impl.cpp (+9/-0)
src/unit_tests/string_instantiate.cpp (+116/-116)
src/util/fs_util.cpp (+1/-1)
src/util/string/rstring.h (+3/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1000478: Build errors using Xcode 4.3.2

High

Fix Released

Link a bug report

Related blueprints

10851. By Paul J. Lucas on 2012-05-17

Moved #pragmas outside of functions.

10850. By Paul J. Lucas on 2012-05-17

Merge from trunk.

10849. By Paul J. Lucas on 2012-05-17

Silenced warnings.

10848. By Paul J. Lucas on 2012-05-16

Hack fix.

10847. By Paul J. Lucas on 2012-05-16

Suppressed warnings.

10846. By Ghislain Fourny on 2012-05-16

Allowing general tree IDs (containing hexadecimal digits and dash) in structural URIs (test). Approved: Markos Zaharioudakis, Matthias Brantner

10845. By Paul J. Lucas on 2012-05-16

Renamed Tokenizer::Numbers to Tokenizer::State now (just prior to the 2.5 release) to give it a better name for the forthcoming addition of the ability to tokenize using include/exclude Item lists. At that time, State will most likely be expanded to include additional state information beyond just numbers, hence the name change.

(In the previous proposal, I had forgotten to update the documentation -- now done.) Approved: Matthias Brantner, Paul J. Lucas

10844. By Nicolae Brinza on 2012-05-16

Documentation improvements. Fixed the type of the options parameter to the parse-fragment() function. Approved: Nicolae Brinza, Matthias Brantner

10843. By Matthias Brantner on 2012-05-16

- no undo is done for collection truncate
- fix for bug #986377 "do not apply any updates on collection if it is to be truncated" Approved: Markos Zaharioudakis, Matthias Brantner

10842. By Matthias Brantner on 2012-05-16

use an instead of ann prefix in the documentation Approved: Matthias Brantner, Chris Hillery